From d729b522d96133aef1849b4adf918dfa26ad6e66 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Fri, 5 Dec 2014 17:00:30 +0000 Subject: [PATCH] contrib: build and link new jansson lib No new functionality yet. To be used for new json APIs. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6590 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/jansson/module.defs | 6 ++ contrib/jansson/module.rules | 2 + gtk/configure.ac | 2 +- libhb/module.defs | 10 ++-- macosx/HandBrake.xcodeproj/project.pbxproj | 66 ++++++++++++---------- make/include/main.defs | 2 + test/module.defs | 2 +- 7 files changed, 53 insertions(+), 37 deletions(-) create mode 100644 contrib/jansson/module.defs create mode 100644 contrib/jansson/module.rules diff --git a/contrib/jansson/module.defs b/contrib/jansson/module.defs new file mode 100644 index 000000000..494dc845e --- /dev/null +++ b/contrib/jansson/module.defs @@ -0,0 +1,6 @@ +$(eval $(call import.MODULE.defs,JANSSON,jansson)) +$(eval $(call import.CONTRIB.defs,JANSSON)) + +JANSSON.FETCH.url = http://download.handbrake.fr/handbrake/contrib/jansson-2.6.tar.bz2 + +JANSSON.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; mkdir m4; autoreconf -fiv; diff --git a/contrib/jansson/module.rules b/contrib/jansson/module.rules new file mode 100644 index 000000000..804e26be5 --- /dev/null +++ b/contrib/jansson/module.rules @@ -0,0 +1,2 @@ +$(eval $(call import.MODULE.rules,JANSSON)) +$(eval $(call import.CONTRIB.rules,JANSSON)) diff --git a/gtk/configure.ac b/gtk/configure.ac index 7630351d2..6704bc693 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -156,7 +156,7 @@ fi GHB_TOOLS_CFLAGS=`$BUILD_PKG_CONFIG --cflags glib-2.0 gdk-pixbuf-2.0` GHB_TOOLS_LIBS=`$BUILD_PKG_CONFIG --libs glib-2.0 gdk-pixbuf-2.0` -HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2" +HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson" case $host in *-*-mingw*) diff --git a/libhb/module.defs b/libhb/module.defs index f45c7e40b..a6eb72fe9 100644 --- a/libhb/module.defs +++ b/libhb/module.defs @@ -1,6 +1,6 @@ __deps__ := A52DEC BZIP2 LIBVPX FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \ - LIBDVDREAD LIBDVDNAV LIBICONV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \ - PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX + LIBDVDREAD LIBDVDNAV LIBICONV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS \ + LIBXML2 PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON $(eval $(call import.MODULE.defs,LIBHB,libhb,$(__deps__))) $(eval $(call import.GCC,LIBHB)) @@ -105,9 +105,9 @@ LIBHB.dll = $(LIBHB.build/)hb.dll LIBHB.lib = $(LIBHB.build/)hb.lib LIBHB.dll.libs = $(foreach n, \ - ass avcodec avformat avutil avresample dvdnav dvdread \ - fontconfig freetype mp3lame \ - ogg samplerate swscale vpx theora vorbis vorbisenc x264 xml2 bluray, \ + ass avcodec avformat avutil avresample dvdnav dvdread fontconfig \ + freetype mp3lame ogg samplerate swscale vpx theora vorbis vorbisenc \ + x264 xml2 bluray jansson, \ $(CONTRIB.build/)lib/lib$(n).a ) ifeq (1,$(FEATURE.fdk_aac)) diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 188f0db40..671ab14d6 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -133,12 +133,14 @@ A932E26C1988334B0047D13E /* AudioDefaults.xib in Resources */ = {isa = PBXBuildFile; fileRef = A932E26A1988334B0047D13E /* AudioDefaults.xib */; }; A932E26F198833920047D13E /* HBAudioDefaultsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A932E26E198833920047D13E /* HBAudioDefaultsController.m */; }; A932E273198834130047D13E /* HBAudioDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = A932E272198834130047D13E /* HBAudioDefaults.m */; }; - A93E0ED31972957000FD67FB /* HBVideoController.m in Sources */ = {isa = PBXBuildFile; fileRef = A93E0ED11972957000FD67FB /* HBVideoController.m */; }; - A93E0ED71972958C00FD67FB /* Video.xib in Resources */ = {isa = PBXBuildFile; fileRef = A93E0ED51972958C00FD67FB /* Video.xib */; }; - A9523937199A6AAE00588AEF /* HBFilters.m in Sources */ = {isa = PBXBuildFile; fileRef = A9523936199A6AAE00588AEF /* HBFilters.m */; }; - A967E4BA1A16768200DF1DFC /* EncodeCanceled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */; }; - A971281F1A2C75180088C076 /* HBTitle.m in Sources */ = {isa = PBXBuildFile; fileRef = A971281E1A2C75180088C076 /* HBTitle.m */; }; - A98C29C41977B10600AF5DED /* HBLanguagesSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */; }; + A93E0ED31972957000FD67FB /* HBVideoController.m in Sources */ = {isa = PBXBuildFile; fileRef = A93E0ED11972957000FD67FB /* HBVideoController.m */; }; + A93E0ED71972958C00FD67FB /* Video.xib in Resources */ = {isa = PBXBuildFile; fileRef = A93E0ED51972958C00FD67FB /* Video.xib */; }; + A9523937199A6AAE00588AEF /* HBFilters.m in Sources */ = {isa = PBXBuildFile; fileRef = A9523936199A6AAE00588AEF /* HBFilters.m */; }; + A955128A1A320A6F001BFC6F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A95512881A320A12001BFC6F /* libjansson.a */; }; + A955128B1A320B02001BFC6F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A95512881A320A12001BFC6F /* libjansson.a */; }; + A967E4BA1A16768200DF1DFC /* EncodeCanceled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */; }; + A971281F1A2C75180088C076 /* HBTitle.m in Sources */ = {isa = PBXBuildFile; fileRef = A971281E1A2C75180088C076 /* HBTitle.m */; }; + A98C29C41977B10600AF5DED /* HBLanguagesSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */; }; A9935213196F38A70069C6B7 /* ChaptersTitles.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9935211196F38A70069C6B7 /* ChaptersTitles.xib */; }; A9AA447A1970664A00D7DEFC /* HBUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AA44791970664A00D7DEFC /* HBUtilities.m */; }; A9BB0F2719A0ECE40079F1C1 /* HBHUDButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BB0F2619A0ECE40079F1C1 /* HBHUDButtonCell.m */; }; @@ -371,12 +373,13 @@ A932E272198834130047D13E /* HBAudioDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioDefaults.m; sourceTree = ""; }; A93E0ED01972957000FD67FB /* HBVideoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBVideoController.h; sourceTree = ""; }; A93E0ED11972957000FD67FB /* HBVideoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBVideoController.m; sourceTree = ""; }; - A93E0ED61972958C00FD67FB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Video.xib; sourceTree = ""; }; - A9523935199A6AAE00588AEF /* HBFilters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFilters.h; sourceTree = ""; }; - A9523936199A6AAE00588AEF /* HBFilters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBFilters.m; sourceTree = ""; }; - A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeCanceled@2x.png"; sourceTree = ""; }; - A971281D1A2C75180088C076 /* HBTitle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBTitle.h; sourceTree = ""; }; - A971281E1A2C75180088C076 /* HBTitle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBTitle.m; sourceTree = ""; }; + A93E0ED61972958C00FD67FB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Video.xib; sourceTree = ""; }; + A9523935199A6AAE00588AEF /* HBFilters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFilters.h; sourceTree = ""; }; + A9523936199A6AAE00588AEF /* HBFilters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBFilters.m; sourceTree = ""; }; + A95512881A320A12001BFC6F /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = external/contrib/lib/libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeCanceled@2x.png"; sourceTree = ""; }; + A971281D1A2C75180088C076 /* HBTitle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBTitle.h; sourceTree = ""; }; + A971281E1A2C75180088C076 /* HBTitle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBTitle.m; sourceTree = ""; }; A98C29C21977B10600AF5DED /* HBLanguagesSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBLanguagesSelection.h; sourceTree = ""; }; A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBLanguagesSelection.m; sourceTree = ""; }; A9935212196F38A70069C6B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = ChaptersTitles.xib; sourceTree = ""; }; @@ -485,12 +488,13 @@ 27D6C76B14B102DA00B785E4 /* libtheora.a in Frameworks */, 27D6C76D14B102DA00B785E4 /* libvorbis.a in Frameworks */, 27D6C76F14B102DA00B785E4 /* libvorbisenc.a in Frameworks */, - 22DD2C4B177B95DA00EF50D3 /* libvpx.a in Frameworks */, - 27D6C77114B102DA00B785E4 /* libx264.a in Frameworks */, - 27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; + 22DD2C4B177B95DA00EF50D3 /* libvpx.a in Frameworks */, + 27D6C77114B102DA00B785E4 /* libx264.a in Frameworks */, + 27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */, + A955128B1A320B02001BFC6F /* libjansson.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 273F203614ADBC200021BE6D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -524,12 +528,13 @@ 27D6C76A14B102DA00B785E4 /* libtheora.a in Frameworks */, 27D6C76C14B102DA00B785E4 /* libvorbis.a in Frameworks */, 27D6C76E14B102DA00B785E4 /* libvorbisenc.a in Frameworks */, - 22DD2C4A177B94DB00EF50D3 /* libvpx.a in Frameworks */, - 27D6C77014B102DA00B785E4 /* libx264.a in Frameworks */, - 27D6C77214B102DA00B785E4 /* libxml2.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; + 22DD2C4A177B94DB00EF50D3 /* libvpx.a in Frameworks */, + 27D6C77014B102DA00B785E4 /* libx264.a in Frameworks */, + 27D6C77214B102DA00B785E4 /* libxml2.a in Frameworks */, + A955128A1A320A6F001BFC6F /* libjansson.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -555,12 +560,13 @@ 27D6C73C14B102DA00B785E4 /* libtheora.a */, 27D6C73D14B102DA00B785E4 /* libvorbis.a */, 27D6C73E14B102DA00B785E4 /* libvorbisenc.a */, - 22DD2C49177B94DB00EF50D3 /* libvpx.a */, - 27D6C73F14B102DA00B785E4 /* libx264.a */, - 27D6C74014B102DA00B785E4 /* libxml2.a */, - ); - name = "Static Libraries"; - sourceTree = ""; + 22DD2C49177B94DB00EF50D3 /* libvpx.a */, + 27D6C73F14B102DA00B785E4 /* libx264.a */, + 27D6C74014B102DA00B785E4 /* libxml2.a */, + A95512881A320A12001BFC6F /* libjansson.a */, + ); + name = "Static Libraries"; + sourceTree = ""; }; 271BA4C914B1238E00BC1D2C /* Support */ = { isa = PBXGroup; diff --git a/make/include/main.defs b/make/include/main.defs index 445796d71..4aa659c6e 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -93,6 +93,8 @@ ifneq (,$(filter $(BUILD.system),solaris)) MODULES += contrib/libiconv endif +MODULES += contrib/jansson + ## these must come after contrib since some contrib modules are optional MODULES += libhb diff --git a/test/module.defs b/test/module.defs index 609c96b5d..6f9904852 100644 --- a/test/module.defs +++ b/test/module.defs @@ -17,7 +17,7 @@ TEST.GCC.l = \ ass avcodec avformat avutil avresample dvdnav dvdread \ fontconfig fribidi mp3lame ogg \ samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \ - bluray freetype xml2 bz2 z + bluray freetype xml2 bz2 z jansson ifeq (1,$(FEATURE.qsv)) TEST.GCC.D += USE_QSV HAVE_THREADS=1 -- 2.40.0