vlc | branch: master | Tristan Matthews <[email protected]> | Fri Oct 31 16:58:25 2014 -0400| [61828fc1b7001dd7192f35686d79144e2e2d4042] | committer: Tristan Matthews
contrib: add JACK Default disabled for now. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=61828fc1b7001dd7192f35686d79144e2e2d4042 --- contrib/src/jack/SHA512SUMS | 1 + contrib/src/jack/config-osx.patch | 25 +++++++++++++++++++++++++ contrib/src/jack/rules.mak | 29 +++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/contrib/src/jack/SHA512SUMS b/contrib/src/jack/SHA512SUMS new file mode 100644 index 0000000..84f4f8a --- /dev/null +++ b/contrib/src/jack/SHA512SUMS @@ -0,0 +1 @@ +a52655ca895e37a49a14cb72811f25c65c54bc26ae6d4ce35331b8b85f87905f1be25a88b2efb96c47b344abd0a6bf9371e4043e05ccf91cb08287835e5cc8ac jack1-0.121.3.tar.gz diff --git a/contrib/src/jack/config-osx.patch b/contrib/src/jack/config-osx.patch new file mode 100644 index 0000000..fd1004f --- /dev/null +++ b/contrib/src/jack/config-osx.patch @@ -0,0 +1,25 @@ +From 7bbaa8a2541987ae8db90819f4a94b9f3b133b24 Mon Sep 17 00:00:00 2001 +From: Tristan Matthews <[email protected]> +Date: Fri, 31 Oct 2014 16:29:26 -0400 +Subject: [PATCH 1/1] config: patch to build on OS X + +--- + config/os/macosx/pThreadUtilities.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/os/macosx/pThreadUtilities.h b/config/os/macosx/pThreadUtilities.h +index bd1d1e8..cdb59b4 100644 +--- a/config/os/macosx/pThreadUtilities.h ++++ b/config/os/macosx/pThreadUtilities.h +@@ -66,7 +66,7 @@ + #define __PTHREADUTILITIES_H__ + + #import "pthread.h" +-#import <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h> ++#import <MacTypes.h> + + #define THREAD_SET_PRIORITY 0 + #define THREAD_SCHEDULED_PRIORITY 1 +-- +1.9.3 + diff --git a/contrib/src/jack/rules.mak b/contrib/src/jack/rules.mak new file mode 100644 index 0000000..6798c3c --- /dev/null +++ b/contrib/src/jack/rules.mak @@ -0,0 +1,29 @@ +# JACK + +JACK_VERSION := 0.121.3 +JACK_URL := https://github.com/jackaudio/jack1/archive/$(JACK_VERSION).tar.gz + +# disabled by default for now +#PKGS += jack +ifeq ($(call need_pkg,"jack"),) +PKGS_FOUND += jack +endif + +$(TARBALLS)/jack1-$(JACK_VERSION).tar.gz: + $(call download,$(JACK_URL)) + +.sum-jack: jack1-$(JACK_VERSION).tar.gz + +jack: jack1-$(JACK_VERSION).tar.gz .sum-jack + $(UNPACK) +ifdef HAVE_MACOSX + $(APPLY) $(SRC)/jack/config-osx.patch +endif + $(UPDATE_AUTOCONFIG) + $(MOVE) + +.jack: jack + $(RECONF) + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) + cd $< && $(MAKE) install + touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
