Skip to content

V
vlc
Commit bbfc58ae authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* backport DJ's commits [16883] and [16884]

parent ee53f903
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
extras/contrib/src/Patches/dvdnav.patch
View file @ bbfc58ae
...@@ -389,7 +389,7 @@ diff -ur libdvdnav/src/vm/vm.c libdvdnav.new/src/vm/vm.c ...@@ -389,7 +389,7 @@ diff -ur libdvdnav/src/vm/vm.c libdvdnav.new/src/vm/vm.c
+if test x"$link_dvdcss" != xyes; then +if test x"$link_dvdcss" != xyes; then
+dnl dlopen libdvdcss +dnl dlopen libdvdcss
+ AC_CHECK_FUNC( dlopen, + AC_CHECK_FUNC( dlopen,
+ [DL_LIBS="" ]. + [DL_LIBS="" ],
+ AC_CHECK_LIB( dl, dlopen, + AC_CHECK_LIB( dl, dlopen,
+ [DL_LIBS=-ld ], + [DL_LIBS=-ld ],
+ AC_MSG_ERROR(You need libdl (dlopen)) + AC_MSG_ERROR(You need libdl (dlopen))
......
extras/contrib/src/packages.mak
View file @ bbfc58ae
...@@ -97,7 +97,7 @@ LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION) ...@@ -97,7 +97,7 @@ LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION)
GOOM2k4_VERSION=2k4-0 GOOM2k4_VERSION=2k4-0
GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
LIBCACA_VERSION=0.9 LIBCACA_VERSION=0.9
LIBCACA_URL=http://sam.zoy.org/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz LIBCACA_URL=http://libcaca.zoy.org/files/libcaca-$(LIBCACA_VERSION).tar.gz
LIBDTS_VERSION=0.0.2 LIBDTS_VERSION=0.0.2
LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
LIBDCA_SVN=svn://svn.videolan.org/libdca/trunk LIBDCA_SVN=svn://svn.videolan.org/libdca/trunk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment