Changeset 6093d524b612005236b89d2722fb2bb84f024f0b

Timestamp:

23/02/06 12:57:38 (3 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1140695858 +0000

git-parent:

[0cf15f0a4b2c137d65440caa535aded89ba6bde9]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1140695858 +0000

Message:

* make more contribs work with SDK. refs #182

Files:

• extras/contrib/Makefile (modified) (1 diff)
• extras/contrib/bootstrap (modified) (1 diff)
• extras/contrib/src/Makefile (modified) (16 diffs)
• extras/contrib/src/Patches/ffmpeg-cvs-osx.patch (deleted)
• extras/contrib/src/Patches/gettext-osx.patch (deleted)
• extras/contrib/src/Patches/libpng-osx.patch (added)
• extras/contrib/src/Patches/libpng.patch (deleted)
• extras/contrib/src/Patches/live-osx.patch (added)
• extras/contrib/src/Patches/livedotcom-osx.patch (deleted)
• extras/contrib/src/packages.mak (modified) (2 diffs)

extras/contrib/Makefile

@@ -104 +104 @@
-    rm -rf tmp
-FORCE:
+

extras/contrib/bootstrap

@@ -69 +69 @@
-# ENVP defines the oldest environment on which the program will be able to run
-# SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
+            SDK_TARGET=10.3
+            echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
-        echo "HAVE_DARWIN_OS = 1" >> config.mak
-10.3
-0
+${SDK_TARGET}
+9
-#       EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
-        EXTRA_CPPFLAGS=" -no-cpp-precomp"
-#       EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
-
+:/usr/local/bin
-        ;;
-    i586-pc-beos)

extras/contrib/src/Makefile

@@ -37 +37 @@
-export PKG_CONFIG_PATH
-export DYLD_LIBRARY_PATH = $(PREFIX)/lib
+export MACOSX_DEPLOYMENT_TARGET = $(SDK_TARGET)
-export LIBRARY_PATH := $(PREFIX)/lib:$(LIBRARY_PATH)
-export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
@@ -117 +118 @@
-
-ifdef HAVE_DARWIN_OS
-conv .i
+
-    .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-    .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
@@ -123 +124 @@
-    .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
-    .glib .libidl .gecko .mpcdec .expat .clinkcc .aclocal
+# .FLAC .expat .clinkcc don't work with SDK yet
+# .glib .libidl .gecko are required to build the mozilla plugin
-# .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
-ifneq ($(HOST),i686-apple-darwin8)
@@ -342 +345 @@
-pkgconfig: pkgconfig-$(PKGCFG_VERSION).tar.gz
-    $(EXTRACT_GZ)
+    patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch
-
-.pkgcfg: pkgconfig
@@ -360 +364 @@
-gettext: gettext-$(GETTEXT_VERSION).tar.gz
-    $(EXTRACT_GZ)
-ifdef HAVE_DARWIN_OS
-    patch -p 0 < Patches/gettext-osx.patch
-endif
-
-.intl: gettext .iconv
@@ -406 +407 @@
-endif
-
+ifdef HAVE_DARWIN_OS
+.iconv:
+    touch $@
+    (cd libiconv; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
+else
-.iconv: libiconv
-ifdef HAVE_DARWIN_OS
-    (cd libiconv; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
-else
-    (cd libiconv; CPPFLAGS="-Dssize_t=long" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
-
-$(INSTALL_NAME)
-
+
+touch $@
+
-
-CLEAN_FILE += .iconv
@@ -563 +566 @@
-    $(EXTRACT_GZ)
-    patch -p 0 < Patches/ogg.patch
+    patch -p 0 < Patches/libogg-1.1.patch
-ifdef HAVE_WINCE
-    patch -p 0 < Patches/libogg-wince.patch
-endif
+    (cd $@; autoconf)
-
-.ogg: libogg
@@ -592 +597 @@
-libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
-    $(EXTRACT_GZ)
+    patch -p 0 < Patches/libvorbis-1.1.patch
+    (cd $@; autoconf)
-
-.vorbis: libvorbis .ogg
@@ -644 +651 @@
-    $(EXTRACT_BZ2)
-    patch -p0 < Patches/theora.patch
+    (cd $@; autoconf)
-
-.theora: libtheora .ogg
@@ -693 +701 @@
-    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest --disable-asm-optimizations && cd src&& make -C libFLAC&& make -C libFLAC install  && cd .. && make -C include install)
-else
-
+autoconf && 
-endif
-    $(INSTALL_NAME)
@@ -862 +870 @@
-ifdef HAVE_WIN32
-    patch -p 0 < Patches/ffmpeg-cvs-win32.patch
-    patch -p 1 < Patches/ffmpeg-cvs-wince.patch
-endif
-ifdef HAVE_WINCE
-    patch -p 1 < Patches/ffmpeg-cvs-wince.patch
-endif
-ifdef HAVE_DARWIN_OS
-    patch -p 0 < Patches/ffmpeg-cvs-osx.patch
-endif
-ifeq ($(HOST),i686-apple-darwin8)
@@ -1012 +1016 @@
-    patch -p 0 < Patches/live.patch
-    patch -p 0 < Patches/livedotcom-win32.patch
-dotcom
+
-
-.live: live
-
+
+
+
+
+
+
-    (cd $<; ./genMakefiles macosx-before-version-10.4 && make )
-
-
+
-    (cd $<;./genMakefiles mingw && make $(HOSTCC))
-else
- ./genMakefiles macos
+./genMakefiles linu
-endif
-endif
@@ -1157 +1165 @@
-.x264: x264
-endif
-$(PREFIX)
+"$(PREFIX)"
-    touch $@
-
@@ -1379 +1387 @@
-libpng: libpng-$(PNG_VERSION).tar.bz2
-    $(EXTRACT_BZ2)
-    cat Patches/libpng.patch | sed s,PREFIX,$(PREFIX), | patch -p0
-ifdef HAVE_WIN32
-    (cd $@; cat ../Patches/libpng-1.2.5-win32.patch | sed s,��PREFIX��,$(PREFIX), | patch -p0)
-
+
+
+
+
-.png: libpng 
-ifdef HAVE_DARWIN_OS
@@ -1429 +1439 @@
-
-.gpg-error: libgpg-error
-
+./autogen.sh && 
-    $(INSTALL_NAME)
-    touch $@
@@ -1514 +1524 @@
-glib: glib-$(GLIB_VERSION).tar.gz
-    $(EXTRACT_GZ)
+    patch -p 0 < Patches/glib.patch
-
-.glib: glib

extras/contrib/src/packages.mak

@@ -41 +41 @@
-LIBICONV_VERSION=1.9.1
-LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
-1
+5
-GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
-FREETYPE2_VERSION=2.1.9
@@ -121 +121 @@
-DAAP_VERSION=0.4.0
-DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
-8
-8
+10
+10
-LIBIDL_VERSION=0.6.8
-LIBIDL_URL=http://andrewtv.org/libIDL/libIDL-$(LIBIDL_VERSION).tar.gz