lldb-git: Add missing patch

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: lldb-git: Add missing patch
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Sun, 31 Jul 2016 15:33:34 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jul 31 17:33:34 2016 +0200
Changeset:	713db859550f6a4e47649c7b183c9d922e39d310

Modified Files:
	pulseaudio-git/Makefile
	pulseaudio-git/distinfo
	pulseaudio-git/patches/patch-configure.ac
Added Files:
	lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake

Log Message:
lldb-git: Add missing patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=713db859550f6a4e47649c7b183c9d922e39d310

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 .../patch-cmake_modules_LLDBStandalone.cmake       | 13 +++++++
 pulseaudio-git/Makefile                            |  2 +-
 pulseaudio-git/distinfo                            |  2 +-
 pulseaudio-git/patches/patch-configure.ac          | 44 ++++++++--------------
 4 files changed, 30 insertions(+), 31 deletions(-)

diffs:
diff --git a/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake b/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
new file mode 100644
index 0000000..879f39e
--- /dev/null
+++ b/lldb-git/patches/patch-cmake_modules_LLDBStandalone.cmake
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- cmake/modules/LLDBStandalone.cmake.orig	2016-07-31 14:13:19.000000000 +0000
++++ cmake/modules/LLDBStandalone.cmake
+@@ -86,7 +86,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
+ 
+   include(AddLLVM)
+   include(HandleLLVMOptions)
+-  include(CheckAtomic)
++  include(cmake/modules/CheckAtomic.cmake)
+ 
+   if (PYTHON_EXECUTABLE STREQUAL "")
+     set(Python_ADDITIONAL_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5)
diff --git a/pulseaudio-git/Makefile b/pulseaudio-git/Makefile
index 4cbaebc..8aa8231 100644
--- a/pulseaudio-git/Makefile
+++ b/pulseaudio-git/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.100 2015/11/02 13:40:41 ryoon Exp $
 
-DISTNAME=	pulseaudio-7.1
+DISTNAME=	pulseaudio-9.0
 CATEGORIES=	audio
 GIT_REPOSITORIES=	pulse
 GIT_REPO.pulse=		git://github.com/pulseaudio/pulseaudio.git
diff --git a/pulseaudio-git/distinfo b/pulseaudio-git/distinfo
index f6122f0..413057e 100644
--- a/pulseaudio-git/distinfo
+++ b/pulseaudio-git/distinfo
@@ -5,7 +5,7 @@ RMD160 (pulseaudio-7.1.tar.gz) = f6138695f1cfddfcb72654e8b204b0731c8a2234
 SHA512 (pulseaudio-7.1.tar.gz) = c2b8946a4dfb4fa2a8c7a504d9375bd51086c0f2f40aa6ddbb56115815a01665f491507d367baa375bc9595e31bb0d88f15208a1c2ad507bfa40e1bde1213091
 Size (pulseaudio-7.1.tar.gz) = 2686090 bytes
 SHA1 (patch-aa) = cd444f13dcee5eb76165c2a4379fe622776e2d6a
-SHA1 (patch-configure.ac) = a71aa8af8ebd8e894e2dd16e2ed6e7543a8cd287
+SHA1 (patch-configure.ac) = 579eee8cda153ea6e8255eef7b93740c9e3d0bd9
 SHA1 (patch-src_Makefile.am) = 4533c3123d4beba08165e40137b73ae37ce62b31
 SHA1 (patch-src_modules_module-detect.c) = 4e1db6d3b3224c097ecd981d3f055880ecff780a
 SHA1 (patch-src_modules_oss_module-oss.c) = 6199e48a842dc076b14d039c249295566bcb2c03
diff --git a/pulseaudio-git/patches/patch-configure.ac b/pulseaudio-git/patches/patch-configure.ac
index c6c9d73..06220e9 100644
--- a/pulseaudio-git/patches/patch-configure.ac
+++ b/pulseaudio-git/patches/patch-configure.ac
@@ -4,16 +4,15 @@ $NetBSD$
 * Adapt /var-paths for pkgsrc defaults.
 * Install default config files in example directory; pkgsrc config
   file framework will install them in the right place.
-* Avoid hardcoded SDK paths on Darwin.
 
---- configure.ac.orig	2016-01-22 10:15:37.000000000 +0000
+--- configure.ac.orig	2016-07-31 15:25:05.000000000 +0000
 +++ configure.ac
 @@ -21,7 +21,7 @@
  
  AC_PREREQ(2.63)
  
 -AC_INIT([pulseaudio],[m4_esyscmd(./git-version-gen .tarball-version)],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/])
-+AC_INIT([pulseaudio],[6.0],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/])
++AC_INIT([pulseaudio],[9.1],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/])
  AC_CONFIG_SRCDIR([src/daemon/main.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_HEADERS([config.h])
@@ -25,25 +24,7 @@ $NetBSD$
          os_is_linux=1
      ;;
      freebsd*)
-@@ -534,15 +533,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub
- if test "x$os_is_darwin" = "x1" ; then
-     AC_MSG_CHECKING([looking for Apple CoreService Framework])
-     # How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope
--    AC_CHECK_HEADER([/Developer/Headers/FlatCarbon/CoreServices.h],
-+    AC_CHECK_HEADER([CoreServices/CoreServices.h],
-         [LIBS="$LIBS -framework CoreServices"],
--        [AC_CHECK_HEADERS([/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h],
--            [LIBS="$LIBS -framework CoreServices"],
--            [AC_MSG_ERROR([CoreServices.h header file not found])]
--        )]
--    )
--
--    AC_MSG_RESULT([ok])
-+        [AC_MSG_ERROR([CoreServices.h header file not found])])
-     AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement])
-     HAVE_BONJOUR=1
- fi
-@@ -1023,7 +1016,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -1037,7 +1036,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
  
  PA_MACHINE_ID="${sysconfdir}/machine-id"
  AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
@@ -52,7 +33,7 @@ $NetBSD$
  AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
  	      [Fallback machine-id file])
  
-@@ -1346,9 +1339,9 @@ fi
+@@ -1360,9 +1359,9 @@ fi
  
  PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
  AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
@@ -64,7 +45,7 @@ $NetBSD$
  AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
  
  PA_BINARY=${bindir}/pulseaudio${EXEEXT}
-@@ -1360,8 +1353,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+@@ -1374,8 +1373,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
  AC_SUBST(PA_SOEXT, [.so])
  AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
  
@@ -72,17 +53,22 @@ $NetBSD$
 -AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files])
 +AC_SUBST(pulseconfdirreal, ["${sysconfdir}/pulse"])
 +AC_SUBST(pulseconfdir, ["${EGDIR}"])
-+AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdirreal, [Location of configuration files])
++AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdirreal, [Location of configuration files]
  
  #### Mac OSX specific stuff #####
  
-@@ -1377,17 +1371,6 @@ AC_ARG_WITH(mac-sysroot,
+@@ -1391,22 +1391,6 @@ AC_ARG_WITH(mac-sysroot,
      AS_HELP_STRING([--with-mac-sysroot=<path>], [SDK basedir to use as the logical root directory for headers and libraries.]),
-     mac_sysroot=$withval, mac_sysroot="/Developer/SDKs/MacOSX10.5.sdk")
+     mac_sysroot=$withval)
  
 -if test "x$os_is_darwin" = "x1" ; then
--    LDFLAGS="$LDFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min"
--    CFLAGS="$CFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min"
+-    LDFLAGS="$LDFLAGS -mmacosx-version-min=$mac_version_min"
+-    CFLAGS="$CFLAGS -mmacosx-version-min=$mac_version_min"
+-
+-    if test "x$mac_sysroot" != "x" ; then
+-        LDFLAGS="$LDFLAGS -isysroot $mac_sysroot"
+-        CFLAGS="$CFLAGS -isysroot $mac_sysroot"
+-    fi
 -
 -    if test "x$enable_mac_universal" = "xyes" ; then
 -        mac_arches="-arch i386 -arch x86_64"
Prev by Date: lldb-git: Sync PLIST with upstrea, it will be softed afterwards
Next by Date: TODO: Sync few entries with reality
Previous by Thread: lldb-git: Sync PLIST with upstrea, it will be softed afterwards
Next by Thread: TODO: Sync few entries with reality
Indexes:
Home | Main Index | Thread Index | Old Index