Commit 95bb60a2 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* updated the live patch and added a sanity check for future Darwin releases

parent 230aaffb
...@@ -128,25 +128,39 @@ case $HOST in ...@@ -128,25 +128,39 @@ case $HOST in
powerpc-apple-darwin9) powerpc-apple-darwin9)
SDK_TARGET=10.4 SDK_TARGET=10.4
echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
# echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
# echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
CFLAGS_TUNING=" -arch ppc -mtune=G4" CFLAGS_TUNING=" -arch ppc -mtune=G4"
# EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" EXTRA_CFLAGS=" -D\${ENVP} -mmacosx-version-min=\${SDK_TARGET}"
# EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" CC="gcc -isysroot \${MACOSX_SDK}"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak CXX="g++ -isysroot \${MACOSX_SDK}"
LD="ld -arch ppc -syslibroot \${MACOSX_SDK}"
echo "PATH = /bin:/usr/bin:/usr/local/bin:" >> config.mak
cat src/Distributions/darwin.mak >> distro.mak cat src/Distributions/darwin.mak >> distro.mak
if test -e /Developer/SDKs; then
echo "SDKs found. Everything is fine." >&2
else
echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
exit 1
fi
;; ;;
i686-apple-darwin9) i686-apple-darwin9)
SDK_TARGET=10.4 SDK_TARGET=10.4
echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak
# echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
# echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
CFLAGS_TUNING=" -march=pentium-m -mtune=prescott" CFLAGS_TUNING=" -march=pentium-m -mtune=prescott"
# EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
# EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
cat src/Distributions/darwin.mak >> distro.mak cat src/Distributions/darwin.mak >> distro.mak
if test -e /Developer/SDKs; then
echo "SDKs found. Everything is fine." >&2
else
echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2
exit 1
fi
;; ;;
i586-pc-beos) i586-pc-beos)
if test -f /boot/beos/system/lib/libbind.so; then if test -f /boot/beos/system/lib/libbind.so; then
......
...@@ -158,14 +158,14 @@ diff -ruN live.orig/liveMedia/include/RTSPClient.hh live/liveMedia/include/RTSPC ...@@ -158,14 +158,14 @@ diff -ruN live.orig/liveMedia/include/RTSPClient.hh live/liveMedia/include/RTSPC
Boolean parseGetParameterHeader(char const* line, Boolean parseGetParameterHeader(char const* line,
const char* param, const char* param,
char*& value); char*& value);
--- live/liveMedia/include/liveMedia_version.hh.orig 2007-05-24 22:44:37.000000000 +0200 --- live/liveMedia/include/liveMedia_version.hh.orig 2007-07-01 11:16:05.000000000 +0200
+++ live/liveMedia/include/liveMedia_version.hh 2007-05-27 14:16:11.000000000 +0200 +++ live/liveMedia/include/liveMedia_version.hh 2007-07-08 23:14:19.000000000 +0200
@@ -5,6 +5,6 @@ @@ -5,6 +5,6 @@
#define _LIVEMEDIA_VERSION_HH #define _LIVEMEDIA_VERSION_HH
#define LIVEMEDIA_LIBRARY_VERSION_STRING "2007.07.01" #define LIVEMEDIA_LIBRARY_VERSION_STRING "2007.07.01"
-#define LIVEMEDIA_LIBRARY_VERSION_INT 1183248000 -#define LIVEMEDIA_LIBRARY_VERSION_INT 1183248000
+#define LIVEMEDIA_LIBRARY_VERSION_INT 9999999999 +#define LIVEMEDIA_LIBRARY_VERSION_INT 9999999999
#endif #endif
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