Integration of libquicktime into the Bundle and create a plugin folder to be used...

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2_5.1@391 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/MacOsXContribBinariesVersion.txt b/MacOsXContribBinariesVersion.txt
index be15c71fd27e18f9cc576a5cb398dd130779e794..4cb162b6e85e12a9207542e25e3d9fdfb82d5aa5 100644 (file)
--- a/MacOsXContribBinariesVersion.txt
+++ b/MacOsXContribBinariesVersion.txt
@@ -1 +1 @@
-0008
+0009

diff --git a/Makefile b/Makefile
index 5f50dec2159a2339a12d127a68ff028ea040bc48..6329509c1f8795777e6a5ca8aa3f02ee0e90a1b5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifeq ($(SYSTEM),Darwin)
 all:    clean app
 
 app:
-       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB  OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(MF_VERSION)\\\" -DHB_BUILD=$(MF_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh MediaFork.app $(MF_VERSION) $(MF_BUILD))
+       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB  OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(MF_VERSION)\\\" -DHB_BUILD=$(MF_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh MediaFork.app $(MF_VERSION) $(MF_BUILD)) ; rm -rf plugins ; mkdir plugins ; cp contrib/lib/libquicktime/* plugins
 
 clean:
        (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )

diff --git a/macosx/localize.sh b/macosx/localize.sh
index 3fb37b2a31d0954c33d115dfbfef55c512ed4f45..92f157fcaecbeb8950b3a2739e74f695a9c207cc 100755 (executable)
--- a/macosx/localize.sh
+++ b/macosx/localize.sh
@@ -18,19 +18,19 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
         <key>CFBundleDevelopmentRegion</key>
         <string>English</string>
         <key>CFBundleDisplayName</key>
-        <string>MediaFork</string>
+        <string>HandBrake</string>
         <key>CFBundleExecutable</key>
-        <string>MediaFork</string>
+        <string>HandBrake</string>
         <key>CFBundleGetInfoString</key>
         <string>0.8.0b1</string>
         <key>CFBundleIconFile</key>
-        <string>MediaFork</string>
+        <string>HandBrake</string>
         <key>CFBundleIdentifier</key>
         <string>org.mediafork.dynalias</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
         <key>CFBundleName</key>
-        <string>MediaFork</string>
+        <string>HandBrake</string>
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleShortVersionString</key>
@@ -40,7 +40,7 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
         <key>CFBundleVersion</key>
         <string>$3</string>
         <key>NSHumanReadableCopyright</key>
-        <string>MediaFork Devs</string>
+        <string>HandBrake Devs</string>
         <key>NSMainNibFile</key>
         <string>MainMenu</string>
         <key>NSPrincipalClass</key>
@@ -48,3 +48,9 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 </dict>
 </plist>" > Info.plist
 
+echo Installing libquicktime Plugins in the $1 Bundle
+cd Resources
+mkdir plugins
+cd plugins
+cp ../../../../contrib/lib/libquicktime/* .
+

diff --git a/test/Makefile b/test/Makefile
index 4bc9c00679cb686a99b9e35d22838509cd0196e4..5e62d208d8bfc5ab6c59cff39e72d32edd1e67c1 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -19,6 +19,7 @@ LDFLAGS += $(LIBS2)
        @echo "Link MediaForkCLI"
        @CMD="g++ $(CXXFLAGS) -o ../MediaForkCLI test.o $(LDFLAGS) -lz -lpthread"; $$CMD || \
        ( echo "Compile line for $@ was:"; echo $$CMD; false )
+        @CMD="rm -rf ../plugins ; mkdir ../plugins ; cp ../contrib/lib/libquicktime/* ../plugins"; $$CMD
 
 
 clean: