From c082c31cb73a59d736aa3430e50b78400fc9381c Mon Sep 17 00:00:00 2001 From: milisbir Date: Mon, 7 Aug 2017 21:47:54 +0300 Subject: [PATCH] vlc.guncellendi --- talimatname/genel/vlc/lua53_compat.patch | 30 ++++++++++++++ talimatname/genel/vlc/talimat | 52 ++++++++++++++++-------- talimatname/genel/vlc/vlc.okubeni | 20 --------- 3 files changed, 65 insertions(+), 37 deletions(-) create mode 100644 talimatname/genel/vlc/lua53_compat.patch delete mode 100644 talimatname/genel/vlc/vlc.okubeni diff --git a/talimatname/genel/vlc/lua53_compat.patch b/talimatname/genel/vlc/lua53_compat.patch new file mode 100644 index 000000000..aeff7b2fd --- /dev/null +++ b/talimatname/genel/vlc/lua53_compat.patch @@ -0,0 +1,30 @@ +commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 +Author: Vinson Lee +Date: Thu Feb 5 14:48:53 2015 -0800 + + lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility. + + In Lua 5.3.0, luaL_checkint was deprecated. + + This patch fixes this build error with Lua 5.3.0. + + lua/demux.c: In function ‘vlclua_demux_peek’: + lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration] + int n = luaL_checkint( L, 1 ); + ^ + + Signed-off-by: Vinson Lee + Signed-off-by: Jean-Baptiste Kempf + +diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h +index efd94f1..85c7fc1 100644 +--- a/modules/lua/vlc.h ++++ b/modules/lua/vlc.h +@@ -38,6 +38,7 @@ + #include + #include + ++#define LUA_COMPAT_APIINTCASTS + #define LUA_COMPAT_MODULE + #include /* Low level lua C API */ + #include /* Higher level C API */ diff --git a/talimatname/genel/vlc/talimat b/talimatname/genel/vlc/talimat index 77567059e..7fb2e2580 100644 --- a/talimatname/genel/vlc/talimat +++ b/talimatname/genel/vlc/talimat @@ -1,30 +1,48 @@ # Description: VLC, özgür ve açık kaynak kodlu, platformlar arası, bir ortam oynatıcı ve çatıdır. # URL: http://www.videolan.org/vlc/ -# Packager: milisarge@gmail.com -# Depends on: libvlc qt5 x264 flac libmad glib dbus libidn librsvg alsa-lib xorg-libxinerama xorg-libxpm libvpx libcdio vcdimager live libdvdcss libdvdread libdvdnav libogg libtheora lame faac libvorbis ffmpeg faad2 liba52 libmpeg2 libmpcdec fribidi lua libdv speex +# Packager: milisarge +# Depends on: libssh2 qt5 x264 flac libmad glib dbus libupnp libidn librsvg alsa-lib xorg-libxinerama xorg-libxpm libvpx libcdio vcdimager live libdvdcss libdvdread libdvdnav libogg libtheora lame faac libvorbis ffmpeg28 faad2 liba52 libmpeg2 libmpcdec fribidi lua libdv speex name=vlc -version=3.0.0 -release=20160606 +version=2.2.6 +release=1 -source=( http://anduin.linuxfromscratch.org/BLFS/$name/$name-$version-$release.tar.xz) +source=(https://download.videolan.org/${name}/${version}/${name}-${version}.tar.xz + lua53_compat.patch) build() { -cd $name-$version-$release + cd $name-$version + sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c + sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp + patch -p1 < "${SRC}/lua53_compat.patch" -sed -i '/seems to be moved/s/^/#/' autotools/ltmain.sh + sed -i '/seems to be moved/s/^/#/' autotools/ltmain.sh + export PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" + export CXXFLAGS+=" -std=c++11" + export LUAC=/usr/bin/luac + export LUA_LIBS="`pkg-config --libs lua`" + export RCC=/usr/bin/rcc-qt5 -BUILDCC=gcc \ -./configure --prefix=/usr \ - --disable-swscale \ - --disable-lua \ - --disable-a52 \ - --disable-avcodec \ - RCC=/usr/bin/rcc-qt5 + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-rpath \ + --enable-faad \ + --enable-nls \ + --enable-lirc \ + --enable-ncurses \ + --enable-realrtsp \ + --enable-aa \ + --enable-vcdx \ + --enable-upnp \ + --enable-opus \ + --enable-sftp - -make -make DESTDIR=$PKG docdir=/usr/share/doc/$name-$version-release install + make + make DESTDIR=$PKG install + for res in 16 32 48 128; do + install -Dm 644 "${SRC}/vlc-${version}/share/icons/${res}x${res}/vlc.png" \ + "${PKG}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + done } diff --git a/talimatname/genel/vlc/vlc.okubeni b/talimatname/genel/vlc/vlc.okubeni deleted file mode 100644 index d491254e4..000000000 --- a/talimatname/genel/vlc/vlc.okubeni +++ /dev/null @@ -1,20 +0,0 @@ -NOTE: this Build (originaly made for Slackware) is a monster -it tries to wrap all dependencies to -vlc into the resulting package by building these deps as static libraries -and then in the final stage linking vlc against all the static libraries. -The resulting package has all the vlc functionality and does not depend on -any software that is not present in a standard full install of Slackware. -This makes my package quite different from all the other vlc builds that are -floating around on the Internet. -/Eric Hameleers/ - -Ce paquet (à l'origine fait pour la distribution Slackware) est un gros morceau -Il dépends de toute une série de recettes de librairies compilés statiquement et -ces librairies sont toutes liées dans ce paquet. De cette façon, cette variante de -vlc contient un maximum de fonctionnalitées et ne dépends sur un nombre beaucoup plus -restreint de librairies. Ce qui rend ce paquet un peu différent de ce que l'on peut -trouver partout sur internet -/Eric Hameleers/ - -Notez également que cette variante de vlc dispose de sa propre copie de qt -afin d'éviter de devoir installer l'ensemble complet de qt.