adium 3136:96d86f4460d9: We can frameworkize the gst deps a bett...
commits at adium.im
commits at adium.im
Sun Feb 21 02:28:18 UTC 2010
details: http://hg.adium.im/adium/rev/96d86f4460d9
revision: 3136:96d86f4460d9
author: Stephen Holt <sholt at adium.im>
date: Sat Feb 20 20:52:54 2010 -0500
We can frameworkize the gst deps a better way. Also, adding one I missed.
Subject: adium 3137:fe47f1cfcf37: Updating to libpurple 2.6.5mtn @ a64b3ed8ac6c82ec1217bddd04603cc0338c8494
details: http://hg.adium.im/adium/rev/fe47f1cfcf37
revision: 3137:fe47f1cfcf37
author: Stephen Holt <sholt at adium.im>
date: Sat Feb 20 21:26:16 2010 -0500
Updating to libpurple 2.6.5mtn @ a64b3ed8ac6c82ec1217bddd04603cc0338c8494
Also adding missing libgsttag.framework. *sigh*
diffs (186 lines):
diff -r 44d8be01e8ab -r fe47f1cfcf37 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Thu Feb 18 12:25:54 2010 -0500
+++ b/Adium.xcodeproj/project.pbxproj Sat Feb 20 21:26:16 2010 -0500
@@ -1481,6 +1481,8 @@
7EA7F05D1124AAA900E0C1F0 /* libgstrtsp.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7EA7F0421124AA8500E0C1F0 /* libgstrtsp.framework */; };
7EA7F05E1124AAA900E0C1F0 /* libgstvideo.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7EA7F0441124AA8500E0C1F0 /* libgstvideo.framework */; };
7EA7F05F1124AAA900E0C1F0 /* liboil.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7EA7F0461124AA8500E0C1F0 /* liboil.framework */; };
+ 7EDDBF141130D02400D31F1E /* libgsttag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7EDDBF131130D02400D31F1E /* libgsttag.framework */; };
+ 7EDDBF1F1130D06700D31F1E /* libgsttag.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7EDDBF131130D02400D31F1E /* libgsttag.framework */; };
811033510CDE170B00EC6038 /* ssl-cdsa.c in Sources */ = {isa = PBXBuildFile; fileRef = 811033500CDE170B00EC6038 /* ssl-cdsa.c */; };
811034050CDE216F00EC6038 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340C1ABE0BD58FAB00D09235 /* Security.framework */; };
811035180CDE783800EC6038 /* SecurityInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 811035170CDE783800EC6038 /* SecurityInterface.framework */; };
@@ -1740,6 +1742,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
+ 7EDDBF1F1130D06700D31F1E /* libgsttag.framework in Copy Frameworks */,
7E7CF7F51124B9A8001CFC73 /* libgstsdp.framework in Copy Frameworks */,
7EA7F05A1124AAA900E0C1F0 /* libgstaudio.framework in Copy Frameworks */,
7EA7F05B1124AAA900E0C1F0 /* libgstcontroller.framework in Copy Frameworks */,
@@ -4690,6 +4693,7 @@
7EA7F0421124AA8500E0C1F0 /* libgstrtsp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgstrtsp.framework; path = Frameworks/libgstrtsp.framework; sourceTree = "<group>"; };
7EA7F0441124AA8500E0C1F0 /* libgstvideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgstvideo.framework; path = Frameworks/libgstvideo.framework; sourceTree = "<group>"; };
7EA7F0461124AA8500E0C1F0 /* liboil.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = liboil.framework; path = Frameworks/liboil.framework; sourceTree = "<group>"; };
+ 7EDDBF131130D02400D31F1E /* libgsttag.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgsttag.framework; path = Frameworks/libgsttag.framework; sourceTree = "<group>"; };
811033500CDE170B00EC6038 /* ssl-cdsa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ssl-cdsa.c"; sourceTree = "<group>"; };
811035170CDE783800EC6038 /* SecurityInterface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityInterface.framework; path = /System/Library/Frameworks/SecurityInterface.framework; sourceTree = "<absolute>"; };
811036160CDE8A2500EC6038 /* AIPurpleCertificateViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPurpleCertificateViewer.h; path = "Plugins/Purple Service/AIPurpleCertificateViewer.h"; sourceTree = "<group>"; };
@@ -4881,6 +4885,7 @@
7EA7F0451124AA8500E0C1F0 /* libgstvideo.framework in Frameworks */,
7EA7F0471124AA8500E0C1F0 /* liboil.framework in Frameworks */,
7E7CF7F11124B982001CFC73 /* libgstsdp.framework in Frameworks */,
+ 7EDDBF141130D02400D31F1E /* libgsttag.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5032,6 +5037,7 @@
1172FCA10CDAA8DE00B8E233 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 7EDDBF131130D02400D31F1E /* libgsttag.framework */,
7E7CF7F01124B982001CFC73 /* libgstsdp.framework */,
7EA7F03C1124AA8500E0C1F0 /* libgstaudio.framework */,
7EA7F03E1124AA8500E0C1F0 /* libgstcontroller.framework */,
diff -r 44d8be01e8ab -r fe47f1cfcf37 Dependencies/phases/build_vv_dependencies.sh
--- a/Dependencies/phases/build_vv_dependencies.sh Thu Feb 18 12:25:54 2010 -0500
+++ b/Dependencies/phases/build_vv_dependencies.sh Sat Feb 20 21:26:16 2010 -0500
@@ -4,6 +4,8 @@
# liboil
# liboil needs special threatment. Rather than placing platform specific code
# in a ifdef, it sequesters it by directory and invokes a makefile. woowoo.
+GSTREAMER_VERSION=0.10
+GST_DEPS=( "liboil-0.3.0.dylib" )
build_liboil() {
prereq "oil" \
"http://liboil.freedesktop.org/download/liboil-0.3.16.tar.gz"
@@ -25,6 +27,7 @@
##
# gst-plugins-base
#
+GST_DEPS=( ${GST_DEPS[@]} "libgstaudio-${GSTREAMER_VERSION}.0.dylib" "libgstvideo-${GSTREAMER_VERSION}.0.dylib" )
build_gst_plugins_base() {
prereq "gst-plugins-base" \
"http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.26.tar.gz"
@@ -77,6 +80,7 @@
##
# gst-plugins-good
#
+GST_DEPS=( ${GST_DEPS[@]} "libgstapp-${GSTREAMER_VERSION}.0.dylib" "libgstnet-${GSTREAMER_VERSION}.0.dylib" "libgstnetbuffer-${GSTREAMER_VERSION}.0.dylib" "libgstdataprotocol-${GSTREAMER_VERSION}.0.dylib" "libgstcontroller-${GSTREAMER_VERSION}.0.dylib" "libgsttag-${GSTREAMER_VERSION}.0.dylib" )
build_gst_plugins_good() {
prereq "gst-plugins-good" \
"http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.18.tar.gz"
@@ -189,6 +193,7 @@
##
# gst-plugins-farsight
#
+GST_DEPS=( ${GST_DEPS[@]} "libgstrtp-${GSTREAMER_VERSION}.0.dylib" "libgstsdp-${GSTREAMER_VERSION}.0.dylib" "libgstrtsp-${GSTREAMER_VERSION}.0.dylib" )
build_gst_plugins_farsight() {
prereq "gst-plugins-farsight" \
"http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.12.11.tar.gz"
@@ -229,7 +234,6 @@
##
# gstreamer
#
-GSTREAMER_VERSION=0.10
build_gstreamer() {
prereq "gstreamer" \
"http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.26.tar.gz"
@@ -266,6 +270,7 @@
##
# libNICE
#
+GST_DEPS=( ${GST_DEPS[@]} "libnice.0.dylib" )
build_nice() {
prereq "nice" \
"http://nice.freedesktop.org/releases/libnice-0.0.10.tar.gz"
diff -r 44d8be01e8ab -r fe47f1cfcf37 Dependencies/phases/make_frameworks.sh
--- a/Dependencies/phases/make_frameworks.sh Thu Feb 18 12:25:54 2010 -0500
+++ b/Dependencies/phases/make_frameworks.sh Sat Feb 20 21:26:16 2010 -0500
@@ -128,42 +128,11 @@
"${FRAMEWORK_DIR}"
status "Adding gst support frameworks..."
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstaudio-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstvideo-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstapp-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstnet-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstnetbuffer-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstrtp-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstsdp-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstrtsp-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstdataprotocol-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libgstcontroller-${GSTREAMER_VERSION}.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/libnice.0.dylib" \
- "${FRAMEWORK_DIR}"
- log python "${ROOTDIR}/framework_maker/frameworkize.py" \
- "${ROOTDIR}/build/lib/liboil-0.3.0.dylib" \
- "${FRAMEWORK_DIR}"
+ for (( i=0; i<${#GST_DEPS[@]}; i++ )) ; do
+ log python "${ROOTDIR}/framework_maker/frameworkize.py" \
+ "${ROOTDIR}/build/lib/${GST_DEPS[i]}" \
+ "${FRAMEWORK_DIR}"
+ done
status "Adding the Adium framework header..."
log cp "${ROOTDIR}/libpurple-full.h" \
diff -r 44d8be01e8ab -r fe47f1cfcf37 Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so has changed
diff -r 44d8be01e8ab -r fe47f1cfcf37 Frameworks/libgsttag.framework/Headers
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libgsttag.framework/Headers Sat Feb 20 21:26:16 2010 -0500
@@ -0,0 +1,1 @@
+Versions/0.10.0/Headers
\ No newline at end of file
diff -r 44d8be01e8ab -r fe47f1cfcf37 Frameworks/libgsttag.framework/Resources
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libgsttag.framework/Resources Sat Feb 20 21:26:16 2010 -0500
@@ -0,0 +1,1 @@
+Versions/0.10.0/Resources
\ No newline at end of file
diff -r 44d8be01e8ab -r fe47f1cfcf37 Frameworks/libgsttag.framework/Versions/0.10.0/Resources/English.lproj/InfoPlist.strings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libgsttag.framework/Versions/0.10.0/Resources/English.lproj/InfoPlist.strings Sat Feb 20 21:26:16 2010 -0500
@@ -0,0 +1,3 @@
+/* Localized versions of Info.plist keys */
+
+CFBundleName = "libgsttag";
diff -r 44d8be01e8ab -r fe47f1cfcf37 Frameworks/libgsttag.framework/Versions/0.10.0/Resources/Info.plist
Binary file Frameworks/libgsttag.framework/Versions/0.10.0/Resources/Info.plist has changed
diff -r 44d8be01e8ab -r fe47f1cfcf37 Frameworks/libgsttag.framework/Versions/0.10.0/libgsttag
Binary file Frameworks/libgsttag.framework/Versions/0.10.0/libgsttag has changed
diff -r 44d8be01e8ab -r fe47f1cfcf37 Frameworks/libgsttag.framework/Versions/Current
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libgsttag.framework/Versions/Current Sat Feb 20 21:26:16 2010 -0500
@@ -0,0 +1,1 @@
+0.10.0
\ No newline at end of file
diff -r 44d8be01e8ab -r fe47f1cfcf37 Frameworks/libgsttag.framework/libgsttag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libgsttag.framework/libgsttag Sat Feb 20 21:26:16 2010 -0500
@@ -0,0 +1,1 @@
+Versions/0.10.0/libgsttag
\ No newline at end of file
diff -r 44d8be01e8ab -r fe47f1cfcf37 Frameworks/libpurple.framework/Versions/0.6.5/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.5/libpurple has changed
More information about the commits
mailing list