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 70a0e8eac..5965a0bbb 100644 --- a/talimatname/genel/vlc/talimat +++ b/talimatname/genel/vlc/talimat @@ -2,37 +2,36 @@ # URL: http://www.videolan.org/vlc/ # Maintainer: Thomas Penteker, tek at serverop dot de # Packager: milisarge@gmail.com -# Depends on: libmad, ffmpeg, qt4, libdvdnav, liba52, libgcrypt +# Depends on: libvlc qt5 x264 flac libmad glib 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 name=vlc -version=2.2.1 +version=2.2.4 release=1 -source=(http://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.xz) +source=(http://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.xz + lua53_compat.patch + update-vlc-plugin-cache.hook) build() { - cd $name-$version +cd $name-$version +patch -Np1 -i ../lua53_compat.patch - # allow building with new avcodec - sed -i 's/ 56/ 57/g' configure.ac - autoreconf -fi +sed -i 's:libsmbclient.h:samba-4.0/&:' modules/access/smb.c - # initialize avformat structure - sed -i 's/AVProbeData *pd;/AVProbeData pd={};/g' modules/demux/avformat/demux.c +sh bootstrap +./configure --prefix=/usr \ + RCC=/usr/bin/rcc-qt5 +sed -i 's/luaL_optint/(int)&eger/' modules/lua/libs/{net,osd,volume}.c +sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \ +modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c - ./configure --prefix=/usr \ - --mandir=/usr/man \ - --disable-nls \ - --disable-fribidi \ - --disable-httpd \ - --disable-dbus \ - --enable-alsa \ - --disable-remoteosd \ - --disable-lua - make - make DESTDIR=$PKG install - rm -rf $PKG/usr/share/doc +make +make DESTDIR=$PKG docdir=/usr/share/doc/$name-$version install - # fix desktop file - sed -i 's/--started-from-file//g' $PKG/usr/share/applications/vlc.desktop -} \ No newline at end of file +install -Dm644 ../update-vlc-plugin-cache.hook $PKG/usr/share/libalpm/hooks/update-vlc-plugin-cache.hook + +rm -rf $PKG/usr/share/doc + +# fix desktop file +sed -i 's/--started-from-file//g' $PKG/usr/share/applications/vlc.desktop +} diff --git a/talimatname/genel/vlc/talimat.qt5 b/talimatname/genel/vlc/talimat.qt5 deleted file mode 100644 index e4a17f9c3..000000000 --- a/talimatname/genel/vlc/talimat.qt5 +++ /dev/null @@ -1,33 +0,0 @@ -# Description: Media player, streamer, and encoder. It can play from many inputs -# URL: http://www.slackware.com/~alien/slackbuilds/vlc/ -# Packager: pierre at nutyx dot org -# Depends on: libvlc qt5 x264 flac libmad glib 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 - -run=(libvlc) -name=vlc -version=2.2.1 -release=4 - -source=( http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz) - -build() { - -source setqt5 - -cd $name-$version -sed -i 's:libsmbclient.h:samba-4.0/&:' modules/access/smb.c - -sh bootstrap -./configure --prefix=/usr - -sed -i 's/luaL_optint/(int)&eger/' modules/lua/libs/{net,osd,volume}.c -sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \ -modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c - -make -make DESTDIR=$PKG docdir=/usr/share/doc/$name-$version install - -rm -r $PKG/usr/{include,lib/pkgconfig} -rm $PKG/usr/lib/libvlc* -rm -rf $PKG/usr/share/doc -} diff --git a/talimatname/genel/vlc/update-vlc-plugin-cache.hook b/talimatname/genel/vlc/update-vlc-plugin-cache.hook new file mode 100644 index 000000000..89fbd2174 --- /dev/null +++ b/talimatname/genel/vlc/update-vlc-plugin-cache.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/vlc/plugins/* + +[Action] +Description = Updating the vlc plugin cache... +When = PostTransaction +Exec = /usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins