From 0132ab45909ff61db3f83c336c7438c6ce151e1f Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Thu, 9 Jun 2005 22:44:02 +0000 Subject: [PATCH 1/1] * Don't build x264 application because it uses getopt which is not available under 10.2 (ugh, ugly hack this is). --- extras/contrib/src/Makefile | 3 ++- extras/contrib/src/Patches/x264.patch | 34 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 extras/contrib/src/Patches/x264.patch diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index c7e5e29e96..7b1a3e018d 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -928,7 +928,8 @@ x264-$(X264_VERSION).tar.gz: x264: x264-$(X264_VERSION).tar.gz $(EXTRACT_GZ) - + patch -p 0 < Patches/x264.patch + rm x264/x264.c .x264: x264 (cd $<; ./configure --enable-pthread --prefix=$(PREFIX) && make && make install) diff --git a/extras/contrib/src/Patches/x264.patch b/extras/contrib/src/Patches/x264.patch new file mode 100644 index 0000000000..7c9fcf9a58 --- /dev/null +++ b/extras/contrib/src/Patches/x264.patch @@ -0,0 +1,34 @@ +diff -ruN x264.orig/Makefile x264/Makefile +--- x264.orig/Makefile Mon May 30 21:47:02 2005 ++++ x264/Makefile Fri Jun 10 00:43:31 2005 +@@ -40,7 +40,7 @@ + OBJS = $(SRCS:%.c=%.o) + DEP = depend + +-default: $(DEP) x264$(EXE) ++default: $(DEP) libx264.a + + libx264.a: .depend $(OBJS) $(OBJASM) + ar rc libx264.a $(OBJS) $(OBJASM) +@@ -61,7 +61,7 @@ + .depend: config.mak config.h + rm -f .depend + # Hacky - because gcc 2.9x doesn't have -MT +- $(foreach SRC, $(SRCS) x264.c, ( echo -n "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;) ++ $(foreach SRC, $(SRCS), ( echo -n "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;) + + config.h: $(wildcard .svn/entries */.svn/entries */*/.svn/entries) + ./version.sh +@@ -78,11 +78,10 @@ + distclean: clean + rm -f config.mak vfw/build/cygwin/config.mak + +-install: x264 ++install: libx264.a + install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) + install -m 644 x264.h $(DESTDIR)$(includedir) + install -m 644 libx264.a $(DESTDIR)$(libdir) +- install x264 $(DESTDIR)$(bindir) + + etags: TAGS + -- 2.39.5