adium 2656:6bfde41995c6: imported patch meanwhile_link
commits at adium.im
commits at adium.im
Tue Sep 1 04:18:25 UTC 2009
details: http://hg.adium.im/adium/rev/6bfde41995c6
revision: 2656:6bfde41995c6
author: Stephen Holt <sholt at adium.im>
date: Tue Sep 01 00:24:08 2009 -0400
imported patch meanwhile_link
Subject: adium 2657:5ecc3d992571: We need to invoke install_name_tool here, also preserve library symlinks.
details: http://hg.adium.im/adium/rev/5ecc3d992571
revision: 2657:5ecc3d992571
author: Stephen Holt <sholt at adium.im>
date: Mon Aug 31 16:40:17 2009 -0400
We need to invoke install_name_tool here, also preserve library symlinks.
Subject: adium 2658:db9f43a5b6a2: Build gst-plugins-base.
details: http://hg.adium.im/adium/rev/db9f43a5b6a2
revision: 2658:db9f43a5b6a2
author: Stephen Holt <sholt at adium.im>
date: Mon Aug 31 17:16:28 2009 -0400
Build gst-plugins-base.
Subject: adium 2659:f7edc236850d: build gst-plugins-good. Also disable some stuff (like goom visualizations) we will likely never need for vv.
details: http://hg.adium.im/adium/rev/f7edc236850d
revision: 2659:f7edc236850d
author: Stephen Holt <sholt at adium.im>
date: Mon Aug 31 17:17:27 2009 -0400
build gst-plugins-good. Also disable some stuff (like goom visualizations) we will likely never need for vv.
Subject: adium 2660:dfe0c8296499: build gst-plugins-bad leaving some things out:
details: http://hg.adium.im/adium/rev/dfe0c8296499
revision: 2660:dfe0c8296499
author: Stephen Holt <sholt at adium.im>
date: Mon Aug 31 18:23:57 2009 -0400
build gst-plugins-bad leaving some things out:
* real support: since it's failing on an #ifdef in ppc for now, and I don't think any vv uses real.
* osx-video: it uses quicktime stuff that breaks in 64-bit, and is only used for capture (see gst-plugins-bad/sys/osxvideo/osxvideosrc.c)
* quicktime: same compile issues in 64-but as osx-video, and I doubt it's commonly used for VV.
Subject: adium 2661:38aa133753e4: build gst-plugins-farsight.
details: http://hg.adium.im/adium/rev/38aa133753e4
revision: 2661:38aa133753e4
author: Stephen Holt <sholt at adium.im>
date: Tue Sep 01 00:24:08 2009 -0400
build gst-plugins-farsight.
Subject: adium 2662:a43cea40319b: Build libnice, NAT traversal lib for farsight.
details: http://hg.adium.im/adium/rev/a43cea40319b
revision: 2662:a43cea40319b
author: Stephen Holt <sholt at adium.im>
date: Tue Sep 01 00:24:08 2009 -0400
Build libnice, NAT traversal lib for farsight.
Subject: adium 2663:6ce00eb0ff57: Build farsight. Final VV dependancy.
details: http://hg.adium.im/adium/rev/6ce00eb0ff57
revision: 2663:6ce00eb0ff57
author: Stephen Holt <sholt at adium.im>
date: Tue Sep 01 00:24:08 2009 -0400
Build farsight. Final VV dependancy.
Subject: adium 2664:a040bba1815d: Libpurple building as ppc/i386/x86_64 with VV support. All that's needded is PO files and frameworkizatoin. Refs #10001
details: http://hg.adium.im/adium/rev/a040bba1815d
revision: 2664:a040bba1815d
author: Stephen Holt <sholt at adium.im>
date: Tue Sep 01 00:24:08 2009 -0400
Libpurple building as ppc/i386/x86_64 with VV support. All that's needded is PO files and frameworkizatoin. Refs #10001
diffs (263 lines):
diff -r d51ad07a1817 -r a040bba1815d Dependencies/build.sh
--- a/Dependencies/build.sh Mon Aug 31 16:10:29 2009 -0400
+++ b/Dependencies/build.sh Tue Sep 01 00:24:08 2009 -0400
@@ -199,7 +199,7 @@
for (( i=0; i<${#HOSTS[@]}; i++ )) ; do
status "...configuring for ${HOSTS[i]}"
quiet mkdir "${ROOTDIR}/sandbox/root-${ARCHS[i]}"
- export CFLAGS="${1} -arch ${ARCHS[i]} -DHAVE_SYMBOL_UNDERSCORE"
+ export CFLAGS="${1} -arch ${ARCHS[i]}"
export LDFLAGS="${2} -arch ${ARCHS[i]}"
${3} --host="${HOSTS[i]}" --build="${HOSTS[i]}" \
@@ -213,16 +213,18 @@
# create universal
for FILE in ${@:4} ; do
+ # change library location and
+ local ext=${FILE##*.}
local lipoFiles=""
for ARCH in ${ARCHS[@]} ; do
- lipoFiles="${lipoFiles} -arch ${ARCH} ${ROOTDIR}/sandbox/root-${ARCH}/${FILE}"
+ if [[ ${ext} == 'dylib' ]] ; then
+ install_name_tool -id "${ROOTDIR}/build/${FILE}" \
+ "${ROOTDIR}/sandbox/root-${ARCH}/${FILE}"
+ fi
+ lipoFiles="${lipoFiles} ${ROOTDIR}/sandbox/root-${ARCH}/${FILE}"
done
status "combine ${lipoFiles} to build/${FILE}"
lipo -create ${lipoFiles} -output "${ROOTDIR}/build/${FILE}"
- local ext=${FILE##*.}
- if [[ ${ext} == 'a' ]] ; then
- ranlib "${ROOTDIR}/build/${FILE}"
- fi
done
#copy headers
@@ -247,10 +249,17 @@
status "patching pkgconfig file: ${f}"
local basename=`basename ${f}`
local SEDREP=`echo $ROOTDIR | awk '{gsub("\\\\\/", "\\\\\\/");print}'`
- local SEDPAT="s/^libdir=.*/prefix=\'${SEDREP}\\/build\\/lib\'/"
+ local SEDPAT="s/^libdir=.*/libdir=\'${SEDREP}\\/build\\/lib\'/"
sed -e "${SEDPAT}" "${f}" > "${ROOTDIR}/build/lib/${basename}"
done
+ #copy symlinks in lib
+ local files="${ROOTDIR}/sandbox/root-${ARCHS[0]}/lib/*"
+ for f in ${files} ; do
+ if [ -h ${f} ] ; then
+ cp -a ${f} "${ROOTDIR}/build/lib"
+ fi
+ done
quiet rm -rf "${ROOTDIR}/sandbox"
}
##
@@ -417,7 +426,7 @@
#
build_meanwhile() {
prereq "meanwhile" \
- "http://dl.sourceforge.net/sourceforge/meanwhile/meanwhile-1.0.2.tar.gz"
+ "http://downloads.sourceforge.net/project/meanwhile/meanwhile/1.0.2/meanwhile-1.0.2.tar.gz"
quiet pushd "$ROOTDIR/source/meanwhile"
@@ -700,12 +709,11 @@
--prefix=$ROOTDIR/build \
--with-static-prpls=$PROTOCOLS \
--disable-plugins \
- --disable-gstreamer \
--disable-avahi \
--disable-dbus \
--enable-gnutls=no \
--enable-nss=no \
- --disable-vv \
+ --enable-vv=yes \
--disable-idn \
$KERBEROS"
xconfigure "$BASE_CFLAGS -I/usr/include/kerberosIV -DHAVE_SSL \
@@ -783,7 +791,7 @@
status "Cross-comiling oil..."
CONFIG_CMD="./configure \
--disable-dependency-tracking"
- xcompile "${BASE_CFLAGS}" "${BASE_LDFLAGS}" "${CONFIG_CMD}" \
+ xcompile "${BASE_CFLAGS} -DHAVE_SYMBOL_UNDERSCORE" "${BASE_LDFLAGS}" "${CONFIG_CMD}" \
"lib/liboil-0.3.0.dylib" \
"lib/liboil-0.3.a"
@@ -803,10 +811,13 @@
if needsconfigure $@; then
status "Configuring gst-plugins-base"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
- ./configure \
- --prefix="$ROOTDIR/build" \
- --disable-dependency-tracking
+ export NM="nm -arch all"
+ CONFIG_CMD="./configure \
+ --prefix=$ROOTDIR/build \
+ --disable-dependency-tracking"
+ xconfigure "${BASE_CFLAGS}" "${BASE_LDFLAGS}" "${CONFIG_CMD}" \
+ "${ROOTDIR}/source/gst-plugins-base/config.h" \
+ "${ROOTDIR}/source/gst-plugins-base/_stdint.h"
fi
status "Building and installing gst-plugins-base"
@@ -821,17 +832,23 @@
#
build_gst_plugins_good() {
prereq "gst-plugins-good" \
- "http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-good-0.10.15.tar.gz"
+ "http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.15.tar.gz"
quiet pushd "$ROOTDIR/source/gst-plugins-good"
if needsconfigure $@; then
status "Configuring gst-plugins-good"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
- ./configure \
- --prefix="$ROOTDIR/build" \
+ export NM="nm -arch all"
+ CONFIG_CMD="./configure \
+ --prefix=$ROOTDIR/build \
--disable-aalib \
- --disable-dependency-tracking
+ --disable-examples \
+ --disable-goom \
+ --disable-goom2k1 \
+ --disable-dependency-tracking"
+ xconfigure "${BASE_CFLAGS}" "${BASE_LDFLAGS}" "${CONFIG_CMD}" \
+ "${ROOTDIR}/source/gst-plugins-good/config.h" \
+ "${ROOTDIR}/source/gst-plugins-good/_stdint.h"
fi
status "Building and installing gst-plugins-good"
@@ -846,16 +863,22 @@
#
build_gst_plugins_bad() {
prereq "gst-plugins-bad" \
- "http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-bad-0.10.13.tar.gz"
+ "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.13.tar.gz"
quiet pushd "$ROOTDIR/source/gst-plugins-bad"
if needsconfigure $@; then
status "Configuring gst-plugins-bad"
- CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
- ./configure \
- --prefix="$ROOTDIR/build" \
- --disable-dependency-tracking
+ export NM="nm -arch all"
+ CONFIG_CMD="./configure \
+ --prefix=$ROOTDIR/build \
+ --disable-real \
+ --disable-osx_video \
+ --disable-quicktime \
+ --disable-dependency-tracking"
+ xconfigure "${BASE_CFLAGS}" "${BASE_LDFLAGS}" "${CONFIG_CMD}" \
+ "${ROOTDIR}/source/gst-plugins-bad/config.h" \
+ "${ROOTDIR}/source/gst-plugins-bad/_stdint.h"
fi
status "Building and installing gst-plugins-bad"
@@ -870,12 +893,13 @@
#
build_gst_plugins_farsight() {
prereq "gst-plugins-farsight" \
- "http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-farsight-0.12.11.tar.gz"
+ "http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.12.11.tar.gz"
quiet pushd "$ROOTDIR/source/gst-plugins-farsight"
if needsconfigure $@; then
status "Configuring gst-plugins-farsight"
+ export NM="nm -arch all"
CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
./configure \
--prefix="$ROOTDIR/build" \
@@ -894,10 +918,10 @@
#
build_gst_plugins() {
build_liboil $@
-# build_gst_plugins_base $@
-# build_gst_plugins_good $@
-# build_gst_plugins_bad $@
-# build_gst_plugins_farsight $@
+ build_gst_plugins_base $@
+ build_gst_plugins_good $@
+ build_gst_plugins_bad $@
+ build_gst_plugins_farsight $@
}
##
@@ -932,6 +956,59 @@
}
##
+# libNICE
+#
+build_nice() {
+ prereq "nice" \
+ "http://nice.freedesktop.org/releases/libnice-0.0.9.tar.gz"
+
+ quiet pushd "$ROOTDIR/source/nice"
+
+ if needsconfigure $@; then
+ status "Configuring NICE"
+ export NM="nm -arch all"
+ CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
+ ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-dependency-tracking
+ fi
+
+ status "Building and installing NICE"
+ make -j $NUMBER_OF_CORES
+ make install
+
+ quiet popd
+}
+
+##
+# farsight
+#
+build_farsight() {
+ build_nice $@
+
+ prereq "farsight" \
+ "http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.14.tar.gz"
+
+ quiet pushd "$ROOTDIR/source/farsight"
+
+ if needsconfigure $@; then
+ status "Configuring farsight"
+ export NM="nm -arch all"
+ CFLAGS="$ARCH_CFLAGS" LDFLAGS="$ARCH_LDFLAGS" \
+ ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-python \
+ --disable-dependency-tracking
+ fi
+
+ status "Building and installing farsight"
+ make -j $NUMBER_OF_CORES
+ make install
+
+ quiet popd
+}
+
+##
# make_po_files
#
make_po_files() {
@@ -1003,8 +1080,9 @@
build_jsonglib $@
build_gstreamer $@
+build_farsight $@
-#build_libpurple $@
+build_libpurple $@
#build_sipe $@
#build_gfire $@
More information about the commits
mailing list