From 09ba1f5a16a4aa5bd663498a2b75c30efc22897d Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sun, 9 Feb 2014 18:44:12 +0000 Subject: [PATCH] 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 --- gtk/configure.ac | 2 +- gtk/src/Makefile.am | 2 +- libhb/module.defs | 2 +- macosx/HandBrake.xcodeproj/project.pbxproj | 14 ++++++------- .../libhb.xcodeproj/project.pbxproj | 20 +++++++++---------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gtk/configure.ac b/gtk/configure.ac index a16ceeb6c..c4362c27e 100644 --- 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 1320d5b2b..10ce7377a 100644 --- 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 ebc25fc15..ffb7e0a40 100644 --- 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 0c5a98ba6..4c1987b33 100644 --- 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 = ""; }; - 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 6540bcf90..6d1f7ff43 100644 --- 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 = ""; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; @@ -172,7 +172,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 0DFF0B720B6BC6E600549488 /* libhb.a */, + 0DFF0B720B6BC6E600549488 /* libhandbrake.a */, ); name = Products; sourceTree = ""; @@ -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 */, -- 2.40.0