From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Mon, 9 Aug 2010 18:19:25 +0000 (+0200)
Subject: contribs: removed outdated patches for Mac
X-Git-Tag: 1.2.0-pre1~5508
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=55bf9d5aaf62cc6b6565451fa1334717a6d70b19;p=vlc

contribs: removed outdated patches for Mac
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index dc887a772c..b4cddc64a3 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -941,9 +941,6 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 
 libvpx: 
 	$(GIT) clone git://review.webmproject.org/libvpx.git
-ifdef HAVE_DARWIN_OS
-	patch -p0 < Patches/libvpx-darwin.patch
-endif
 
 ifdef HAVE_WIN32
 VPX_TARGET=x86-win32-gcc
@@ -965,7 +962,8 @@ endif
 endif
 
 .libvpx: libvpx
-	(cd $<; CROSS=$(HOST)- ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && make && make install)
+	(cd $<; CROSS=$(HOST)- ./configure --target=$(VPX_TARGET) --disable-install-bins --disable-install-srcs --disable-install-libs --disable-examples && make && make 
+install)
 	(rm -rf $(PREFIX)/include/vpx/ && mkdir $(PREFIX)/include/vpx/; cd $< && cp vpx/*.h vpx_ports/*.h $(PREFIX)/include/vpx/) # Of course, why the hell would one expect it to be listed or in make install?
 	rm $(PREFIX)/include/vpx/config.h
 	(cd $<; $(RANLIB) libvpx.a && cp libvpx.a $(PREFIX)/lib) # Of course, why the hell would one expect it to be listed or in make install?
@@ -1684,9 +1682,6 @@ else
 	(cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0)
 endif
 	(patch -p0 < Patches/libpng-makefile.patch)
-ifdef HAVE_DARWIN_OS_ON_INTEL
-	(patch -p0 < Patches/libpng-darwin-mactel.patch)
-endif
 
 .png: libpng .zlib
 ifdef HAVE_DARWIN_OS
diff --git a/extras/contrib/src/Patches/libpng-darwin-mactel.patch b/extras/contrib/src/Patches/libpng-darwin-mactel.patch
deleted file mode 100644
index 4728399330..0000000000
--- a/extras/contrib/src/Patches/libpng-darwin-mactel.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libpng/scripts/makefile.darwin	2006-07-28 16:53:49.000000000 +0200
-+++ libpng2/scripts/makefile.darwin	2006-07-28 16:45:50.000000000 +0200
-@@ -65,7 +65,7 @@
- 	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- 	pngwtran.o pngmem.o pngerror.o pngpread.o 
- 
--OBJSDLL = $(OBJS:.o=.pic.o)
-+OBJSDLL = $(OBJS:.o=.pic.o) pnggccrd.pic.o
- 
- .SUFFIXES:      .c .o .pic.o
- 
-@@ -226,5 +226,6 @@
- pngwtran.o pngwtran.pic.o: png.h pngconf.h
- pngwutil.o pngwutil.pic.o: png.h pngconf.h
- pngpread.o pngpread.pic.o: png.h pngconf.h
-+pnggccrd.o pnggccrd.pic.o: png.h pngconf.h
- 
- pngtest.o: png.h pngconf.h
diff --git a/extras/contrib/src/Patches/libpng-osx.patch b/extras/contrib/src/Patches/libpng-osx.patch
index bf31f47ce1..3a7a9246c0 100644
--- a/extras/contrib/src/Patches/libpng-osx.patch
+++ b/extras/contrib/src/Patches/libpng-osx.patch
@@ -1,37 +1,6 @@
 diff -urN libpng-1.2.41/scripts/makefile.darwin libpng/scripts/makefile.darwin
 --- libpng-1.2.41/scripts/makefile.darwin       2009-12-03 04:46:02 +0300
 +++ libpng/scripts/makefile.darwin       2009-12-04 14:37:52 +0300
-@@ -10,14 +10,14 @@
- # and license in png.h
-
- # where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
--prefix=/usr/local
-+prefix=??PREFIX??
- exec_prefix=$(prefix)
-
- # Where the zlib library and include files are located
--#ZLIBLIB=/usr/local/lib
--#ZLIBINC=/usr/local/include
--ZLIBLIB=../zlib
--ZLIBINC=../zlib
-+ZLIBLIB=/usr/lib
-+ZLIBINC=/usr/include
-+#ZLIBLIB=../zlib
-+#ZLIBINC=../zlib
-
- # Library name:
- LIBNAME = libpng12
-@@ -42,8 +42,8 @@
- RM_F=/bin/rm -f
-
- # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
--CFLAGS=-I$(ZLIBINC) -W -Wall -O -funroll-loops
--LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
-+CFLAGS=-DPNG_CONFIGURE_LIBPNG ??EXTRA_CFLAGS?? -I$(ZLIBINC) -W -Wall -O -funroll-loops
-+LDFLAGS=??EXTRA_LDFLAGS?? -L. -L$(ZLIBLIB) -lpng12 -lz
-
- INCPATH=$(prefix)/include
- LIBPATH=$(exec_prefix)/lib
 @@ -76,7 +76,7 @@
  .c.pic.o:
         $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
diff --git a/extras/contrib/src/Patches/libvpx-darwin.patch b/extras/contrib/src/Patches/libvpx-darwin.patch
deleted file mode 100644
index 7a0c4b0eba..0000000000
--- a/extras/contrib/src/Patches/libvpx-darwin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- vpx/configure	2010-05-18 17:58:33.000000000 +0200
-+++ vpx_fixed/configure	2010-05-23 01:03:13.000000000 +0200
-@@ -411,9 +411,7 @@
-         }
-     fi
-     check_header stdio.h || die "Unable to invoke compiler: ${CC} ${CFLAGS}"
--    check_ld <<EOF || die "Toolchain is unable to link executables"
--int main(void) {return 0;}
--EOF
-+    
-     # check system headers
-     check_header stdint.h
-     check_header pthread.h
---- vpx/vpx_ports/vpx_integer.h	2010-05-18 17:58:33.000000000 +0200
-+++ vpx_fixed/vpx_ports/vpx_integer.h	2010-05-23 01:41:37.000000000 +0200
-@@ -43,10 +43,6 @@
- typedef signed char int_fast8_t;
- typedef unsigned char uint_fast8_t;
- 
--#ifndef _UINTPTR_T_DEFINED
--typedef unsigned int   uintptr_t;
--#endif
--
- #endif
- 
- #endif