Commit 5f1364a0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* limit x264 to rev 701 for now and apply our patch taken from branch (r23341...

* limit x264 to rev 701 for now and apply our patch taken from branch (r23341 and r23322). additionally, checkout stuff from svn instead of exporting. This makes it easier to track useful revisions for releases
parent ecaa9249
......@@ -727,7 +727,7 @@ DISTCLEAN_PKG += libvorbis-$(VORBIS_VERSION).tar.gz
ifdef SVN
tremor:
$(SVN) export http://svn.xiph.org/trunk/Tremor tremor
$(SVN) co http://svn.xiph.org/trunk/Tremor tremor
(cd $@ && patch -p0 < ../Patches/tremor.patch)
(cd $@; rm -f ogg.h && echo "#include <ogg/ogg.h>" > ogg.h && rm -f os_types.h && echo "#include <ogg/os_types.h>" > os_types.h && ./autogen.sh)
else
......@@ -939,7 +939,7 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
## No reasons to use SVN anymore
#ifdef SVN
#libebml:
# $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libebml libebml
# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml libebml
#else
libebml: libebml-$(LIBEBML_VERSION).tar.bz2
$(EXTRACT_BZ2)
......@@ -978,7 +978,7 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
## No reasons to use SVN anymore
#if SVN
#libmatroska:
# $(SVN) export http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
# $(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska libmatroska
#else
libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
$(EXTRACT_BZ2)
......@@ -1053,7 +1053,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
ifdef SVN
ffmpeg:
$(SVN) export $(FFMPEG_SVN) ffmpeg
$(SVN) co $(FFMPEG_SVN) -r ffmpeg
(cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch && \
patch -p1 < ../Patches/ffmpeg-svn-avdevices.patch)
ifeq ($(HOST),i586-pc-beos)
......@@ -1116,7 +1116,7 @@ libdvdcss-$(LIBDVDCSS_VERSION).tar.gz:
ifdef SVN
libdvdcss:
$(SVN) export svn://svn.videolan.org/libdvdcss/trunk libdvdcss
$(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
cd $@ && sh bootstrap
else
libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
......@@ -1157,7 +1157,7 @@ CLEAN_FILE += .dvdread
ifdef SVN
libdvdnav:
$(SVN) export $(LIBDVDNAV_SVN) libdvdnav
$(SVN) co $(LIBDVDNAV_SVN) libdvdnav
patch -p0 < Patches/libdvdnav.patch
(cd $@; ./autogen.sh noconfig)
else
......@@ -1350,10 +1350,13 @@ x264-$(X264_VERSION).tar.gz:
ifdef SVN
x264:
$(SVN) export svn://svn.videolan.org/x264/trunk/ x264
$(SVN) co svn://svn.videolan.org/x264/trunk/ -r 701 x264
ifdef HAVE_WIN32
(cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
endif
ifdef HAVE_DARWIN_OS
(cd $@; patch -p 0 < ../Patches/x264-svn-darwin.patch )
endif
else
x264: x264-$(X264_VERSION).tar.gz
......@@ -1722,7 +1725,7 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
#ifdef SVN
#libraw1394:
# $(SVN) export -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394 libraw1394
# $(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394 libraw1394
# (cd $<; libtoolize --copy --force; \
# autopoint -f; \
# aclocal -I extras/contrib/share/aclocal; \
......@@ -1753,7 +1756,7 @@ DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz
#ifdef SVN
#libdc1394:
# $(SVN) export -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394 libdc1394
# $(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394 libdc1394
# (cd $<; libtoolize --copy --force; \
# autopoint -f; \
# aclocal -I extras/contrib/share/aclocal; \
......
Index: configure
===================================================================
--- configure (revision 701)
+++ configure (working copy)
@@ -396,7 +396,7 @@
CFLAGS="$CFLAGS -fPIC"
ASFLAGS="$ASFLAGS -D__PIC__"
# resolve textrels in the x86 asm
- LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
+ LDFLAGS="$LDFLAGS -Wl"
fi
if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
Index: common/common.h
===================================================================
--- common/common.h (revision 701)
+++ common/common.h (working copy)
@@ -67,7 +67,7 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include "x264.h"
+#include "../x264.h"
#include "bs.h"
#include "set.h"
#include "predict.h"
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