libhb: change libhb.a to libhandbrake.a

On linux, there is a problem with some distros that dynamically link
harfbuzz (libhb) to libass.  The name conflicts with our libhb.  So this
changes the library name to resolve the conflict.

It only changes libhb.a.  It does not affect the windows libraries
hb.lib and hb.dll

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6020 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/configure.ac b/gtk/configure.ac
index a16ceeb6c9a2df79dfb075c579f53328836dba24..c4362c27ee4b13857263d6dfab91e136b70dbbd9 100644 (file)
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -179,7 +179,7 @@ case $host in
     ;;
 esac
 
-HB_LIBS="-lhb -la52 -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
+HB_LIBS="-lhandbrake -la52 -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
 
 if test "x$use_fdk_aac" = "xyes" ; then
     HB_LIBS+=" -lfdk-aac"

diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
index 1320d5b2bc00757841c9a513638a41f8f4ba62e7..10ce7377a4f9f19f02164e76fcd2c6a5bb40393b 100644 (file)
--- a/gtk/src/Makefile.am
+++ b/gtk/src/Makefile.am
@@ -112,7 +112,7 @@ endif
 
 ghb_LDADD = $(HB_LIBS) $(GHB_LIBS)
 
-ghb_DEPENDENCIES = $(HB_DIR)/libhb/libhb.a
+ghb_DEPENDENCIES = $(HB_DIR)/libhb/libhandbrake.a
 
 resources.o: resource_data.h
 

diff --git a/libhb/module.defs b/libhb/module.defs
index ebc25fc1547a45647416c9a93410f3db2a1ee987..ffb7e0a40fca14a6155648bd367211c66e2dc612 100644 (file)
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -24,7 +24,7 @@ LIBHB.h.out = $(patsubst $(SRC/)%,$(BUILD/)%,$(LIBHB.h.in))
 
 ###############################################################################
 
-LIBHB.a = $(LIBHB.build/)$(call TARGET.archive,hb)
+LIBHB.a = $(LIBHB.build/)$(call TARGET.archive,handbrake)
 
 ###############################################################################
 

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 0c5a98ba6a7ba48bf962a8338429222565a52ac6..4c1987b332431e1a206b5fe582ae2c41a0798455 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -74,8 +74,8 @@
                273F219114ADDDA10021BE6D /* Queue.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F218814ADDDA10021BE6D /* Queue.xib */; };
                273F21C114ADE7A20021BE6D /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20BF14ADC1250021BE6D /* Growl.framework */; };
                273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20C014ADC1250021BE6D /* Sparkle.framework */; };
-               27D6C72514B1019100B785E4 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhb.a */; };
-               27D6C72614B1019100B785E4 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhb.a */; };
+               27D6C72514B1019100B785E4 /* libhandbrake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhandbrake.a */; };
+               27D6C72614B1019100B785E4 /* libhandbrake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhandbrake.a */; };
                27D6C74114B102DA00B785E4 /* liba52.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72714B102DA00B785E4 /* liba52.a */; };
                27D6C74214B102DA00B785E4 /* liba52.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72714B102DA00B785E4 /* liba52.a */; };
                27D6C74314B102DA00B785E4 /* libass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72814B102DA00B785E4 /* libass.a */; };
@@ -287,7 +287,7 @@
                277EFE9017ED72A1001D4A6A /* libmkv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmkv.a; path = external/contrib/lib/libmkv.a; sourceTree = BUILT_PRODUCTS_DIR; };
                277EFE9117ED7749001D4A6A /* libfaac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfaac.a; path = external/contrib/lib/libfaac.a; sourceTree = BUILT_PRODUCTS_DIR; };
                277EFE9217ED799E001D4A6A /* libfdk-aac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfdk-aac.a"; path = "../../../../Users/mike/Library/Developer/Xcode/DerivedData/HandBrake-anpxrfhxsejsxehiwuiaexjoygra/Build/Products/debug/external/contrib/lib/libfdk-aac.a"; sourceTree = "<group>"; };
-               27D6C72414B1019100B785E4 /* libhb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhb.a; path = external/libhb/libhb.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               27D6C72414B1019100B785E4 /* libhandbrake.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhandbrake.a; path = external/libhb/libhandbrake.a; sourceTree = BUILT_PRODUCTS_DIR; };
                27D6C72714B102DA00B785E4 /* liba52.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liba52.a; path = external/contrib/lib/liba52.a; sourceTree = BUILT_PRODUCTS_DIR; };
                27D6C72814B102DA00B785E4 /* libass.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libass.a; path = external/contrib/lib/libass.a; sourceTree = BUILT_PRODUCTS_DIR; };
                27D6C72914B102DA00B785E4 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = external/contrib/lib/libavcodec.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -358,7 +358,7 @@
                                273F202A14ADB8D60021BE6D /* libiconv.dylib in Frameworks */,
                                273F202814ADB8BE0021BE6D /* libbz2.dylib in Frameworks */,
                                273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */,
-                               27D6C72614B1019100B785E4 /* libhb.a in Frameworks */,
+                               27D6C72614B1019100B785E4 /* libhandbrake.a in Frameworks */,
                                27D6C74214B102DA00B785E4 /* liba52.a in Frameworks */,
                                27D6C74414B102DA00B785E4 /* libass.a in Frameworks */,
                                27D6C74614B102DA00B785E4 /* libavcodec.a in Frameworks */,
@@ -397,7 +397,7 @@
                                273F20C314ADC4AE0021BE6D /* libiconv.dylib in Frameworks */,
                                273F20C414ADC4B60021BE6D /* libbz2.dylib in Frameworks */,
                                273F20C514ADC4BD0021BE6D /* libz.dylib in Frameworks */,
-                               27D6C72514B1019100B785E4 /* libhb.a in Frameworks */,
+                               27D6C72514B1019100B785E4 /* libhandbrake.a in Frameworks */,
                                27D6C74114B102DA00B785E4 /* liba52.a in Frameworks */,
                                27D6C74314B102DA00B785E4 /* libass.a in Frameworks */,
                                27D6C74514B102DA00B785E4 /* libavcodec.a in Frameworks */,
@@ -428,7 +428,7 @@
                271BA4C714B1236D00BC1D2C /* Static Libraries */ = {
                        isa = PBXGroup;
                        children = (
-                               27D6C72414B1019100B785E4 /* libhb.a */,
+                               27D6C72414B1019100B785E4 /* libhandbrake.a */,
                                27D6C72714B102DA00B785E4 /* liba52.a */,
                                27D6C72814B102DA00B785E4 /* libass.a */,
                                27D6C72914B102DA00B785E4 /* libavcodec.a */,
@@ -727,7 +727,7 @@
                        );
                        name = external;
                        passBuildSettingsInEnvironment = 1;
-                       productName = libhb;
+                       productName = libhandbrake;
                };
 /* End PBXLegacyTarget section */
 

diff --git a/macosx/InstantHandBrake/libhb.xcodeproj/project.pbxproj b/macosx/InstantHandBrake/libhb.xcodeproj/project.pbxproj
index 6540bcf902a5db252ba32fcad657c23cd090d104..6d1f7ff437ec02ee7eb4fdf38f2661fe284781e2 100644 (file)
--- a/macosx/InstantHandBrake/libhb.xcodeproj/project.pbxproj
+++ b/macosx/InstantHandBrake/libhb.xcodeproj/project.pbxproj
@@ -70,7 +70,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-               0DFF0B720B6BC6E600549488 /* libhb.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhb.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               0DFF0B720B6BC6E600549488 /* libhandbrake.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhandbrake.a; sourceTree = BUILT_PRODUCTS_DIR; };
                1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
@@ -172,7 +172,7 @@
                19C28FACFE9D520D11CA2CBB /* Products */ = {
                        isa = PBXGroup;
                        children = (
-                               0DFF0B720B6BC6E600549488 /* libhb.a */,
+                               0DFF0B720B6BC6E600549488 /* libhandbrake.a */,
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -276,9 +276,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-               0DFF0B710B6BC6E600549488 /* libhb */ = {
+               0DFF0B710B6BC6E600549488 /* libhandbrake */ = {
                        isa = PBXNativeTarget;
-                       buildConfigurationList = 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */;
+                       buildConfigurationList = 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhandbrake" */;
                        buildPhases = (
                                0DFF0B6E0B6BC6E600549488 /* Headers */,
                                0DFF0B6F0B6BC6E600549488 /* Sources */,
@@ -288,9 +288,9 @@
                        );
                        dependencies = (
                        );
-                       name = libhb;
+                       name = libhandbrake;
                        productName = libmediafork;
-                       productReference = 0DFF0B720B6BC6E600549488 /* libhb.a */;
+                       productReference = 0DFF0B720B6BC6E600549488 /* libhandbrake.a */;
                        productType = "com.apple.product-type.library.static";
                };
 /* End PBXNativeTarget section */
@@ -298,14 +298,14 @@
 /* Begin PBXProject section */
                29B97313FDCFA39411CA2CEA /* Project object */ = {
                        isa = PBXProject;
-                       buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "libhb" */;
+                       buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "libhandbrake" */;
                        compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        mainGroup = 29B97314FDCFA39411CA2CEA /* HandBrake */;
                        projectDirPath = "";
                        projectRoot = "";
                        targets = (
-                               0DFF0B710B6BC6E600549488 /* libhb */,
+                               0DFF0B710B6BC6E600549488 /* libhandbrake */,
                        );
                };
 /* End PBXProject section */
@@ -511,7 +511,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-               0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */ = {
+               0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhandbrake" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                0DFF0B740B6BC70400549488 /* Development */,
@@ -521,7 +521,7 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Deployment;
                };
-               4D4E7BC4087804870051572B /* Build configuration list for PBXProject "libhb" */ = {
+               4D4E7BC4087804870051572B /* Build configuration list for PBXProject "libhandbrake" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                4D4E7BC5087804870051572B /* Development */,