SHA256
1
0
forked from pool/vlc

- Fix build with LUA 5.3 / 5.3.1.

- Enabled Qt5 for targets that support it.
- Regenerate the cache for all packages that install plugins.

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=135
This commit is contained in:
Dominique Leuenberger 2015-07-24 12:28:47 +00:00 committed by Git OBS Bridge
parent b4fb370408
commit 06ebb3038c
2 changed files with 19 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 24 12:28:32 UTC 2015 - dimstar@opensuse.org
- Fix build with LUA 5.3 / 5.3.1.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 15 10:11:17 UTC 2015 - joerg.lorenzen@ki.tng.de Fri May 15 10:11:17 UTC 2015 - joerg.lorenzen@ki.tng.de

View File

@ -96,8 +96,8 @@ BuildRequires: libtheora-devel >= 1.0
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libudev-devel >= 142 BuildRequires: libudev-devel >= 142
BuildRequires: libvorbis-devel >= 1.1 BuildRequires: libvorbis-devel >= 1.1
BuildRequires: libxml2-devel >= 2.5
BuildRequires: libvpx-devel BuildRequires: libvpx-devel
BuildRequires: libxml2-devel >= 2.5
BuildRequires: lirc-devel BuildRequires: lirc-devel
BuildRequires: live555-devel >= 2015.01.27 BuildRequires: live555-devel >= 2015.01.27
BuildRequires: lua-devel >= 5.1 BuildRequires: lua-devel >= 5.1
@ -309,6 +309,17 @@ date
%endif %endif
%endif %endif
### Fix up sources for LUA 5.3
if pkg-config --atleast-version 5.3 lua; then
sed -i 's/luaL_optint/(int)&eger/' modules/lua/libs/{net,osd,volume}.c
fi
### And LUA 5.3.1 has some more API changes
if pkg-config --atleast-version 5.3.1 lua; then
sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \
modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c
fi
# We do not rely on contrib but make use of system libraries # We do not rely on contrib but make use of system libraries
rm -rf contrib rm -rf contrib
# fix builddate info # fix builddate info