Commit 77b38910 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

contribs: use libdvdcss 1.2.10 instead of HEAD to prevent issues on Win32 and Darwin

parent a3cc30ca
...@@ -1096,33 +1096,33 @@ DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz ...@@ -1096,33 +1096,33 @@ DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz
# libdvdcss # libdvdcss
# *************************************************************************** # ***************************************************************************
libdvdcss-$(LIBDVDCSS_VERSION).tar.gz: libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2:
$(WGET) $(LIBDVDCSS_URL) $(WGET) $(LIBDVDCSS_URL)
ifdef SVN # ifdef SVN
libdvdcss: # libdvdcss:
$(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss # $(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
cd $@ && sh bootstrap # cd $@ && sh bootstrap
else # else
libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
$(EXTRACT_GZ) $(EXTRACT_BZ2)
endif # endif
.dvdcss: libdvdcss .dvdcss: libdvdcss
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --disable-doc --prefix=$(PREFIX) && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --disable-doc --prefix=$(PREFIX) && make && make install)
$(INSTALL_NAME) $(INSTALL_NAME)
touch $@ touch $@
ifdef SVN # ifdef SVN
libdvdcss-source: libdvdcss # libdvdcss-source: libdvdcss
tar cv --exclude=.svn libdvdcss | bzip2 > libdvdcss-$(DATE).tar.bz2 # tar cv --exclude=.svn libdvdcss | bzip2 > libdvdcss-$(DATE).tar.bz2
#
SOURCE += libdvdcss-source # SOURCE += libdvdcss-source
endif # endif
CLEAN_FILE += .dvdcss CLEAN_FILE += .dvdcss
CLEAN_PKG += libdvdcss CLEAN_PKG += libdvdcss
DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
# *************************************************************************** # ***************************************************************************
# dummy dvdread to trigger the INSTALL_NAME script # dummy dvdread to trigger the INSTALL_NAME script
......
...@@ -99,8 +99,8 @@ LIBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 ...@@ -99,8 +99,8 @@ LIBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
FFMPEG_VERSION=0.4.8 FFMPEG_VERSION=0.4.8
FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
LIBDVDCSS_VERSION=1.2.9 LIBDVDCSS_VERSION=1.2.10
LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
LIBDVDNAV_VERSION=4.1.1 LIBDVDNAV_VERSION=4.1.1
LIBDVDNAV_URL=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz LIBDVDNAV_URL=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
LIBDVDNAV_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav LIBDVDNAV_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
......
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