vlc.guncellendi
This commit is contained in:
parent
b8d83696fa
commit
c082c31cb7
|
@ -0,0 +1,30 @@
|
||||||
|
commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
|
||||||
|
Author: Vinson Lee <vlee@freedesktop.org>
|
||||||
|
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 <vlee@freedesktop.org>
|
||||||
|
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
|
||||||
|
|
||||||
|
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 <vlc_stream.h>
|
||||||
|
#include <vlc_demux.h>
|
||||||
|
|
||||||
|
+#define LUA_COMPAT_APIINTCASTS
|
||||||
|
#define LUA_COMPAT_MODULE
|
||||||
|
#include <lua.h> /* Low level lua C API */
|
||||||
|
#include <lauxlib.h> /* Higher level C API */
|
|
@ -1,30 +1,48 @@
|
||||||
# Description: VLC, özgür ve açık kaynak kodlu, platformlar arası, bir ortam oynatıcı ve çatıdır.
|
# 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/
|
# URL: http://www.videolan.org/vlc/
|
||||||
# Packager: milisarge@gmail.com
|
# Packager: milisarge
|
||||||
# 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
|
# 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
|
name=vlc
|
||||||
version=3.0.0
|
version=2.2.6
|
||||||
release=20160606
|
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() {
|
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 \
|
./configure --prefix=/usr \
|
||||||
--disable-swscale \
|
--sysconfdir=/etc \
|
||||||
--disable-lua \
|
--disable-rpath \
|
||||||
--disable-a52 \
|
--enable-faad \
|
||||||
--disable-avcodec \
|
--enable-nls \
|
||||||
RCC=/usr/bin/rcc-qt5
|
--enable-lirc \
|
||||||
|
--enable-ncurses \
|
||||||
|
--enable-realrtsp \
|
||||||
|
--enable-aa \
|
||||||
|
--enable-vcdx \
|
||||||
|
--enable-upnp \
|
||||||
|
--enable-opus \
|
||||||
|
--enable-sftp
|
||||||
|
|
||||||
make
|
make
|
||||||
make DESTDIR=$PKG docdir=/usr/share/doc/$name-$version-release install
|
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
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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.
|
|
Loading…
Reference in New Issue