RHEL/Fedora: fix KDEDIRS in kdebase, fix systemsettings segfault, add JACK support in ARTS

2 files changed, 64 insertions, 4 deletions

diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch b/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch
new file mode 100644
index 000000000..28dfa50a5
--- /dev/null
+++ b/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch
@@ -0,0 +1,52 @@
+diff -Nuar arts.ORI/CMakeLists.txt arts/CMakeLists.txt
+--- arts.ORI/CMakeLists.txt	2011-12-16 20:58:30.000000000 +0100
++++ arts/CMakeLists.txt	2011-12-16 20:59:20.462377316 +0100
+@@ -34,6 +34,7 @@
+ option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )
+ option( WITH_MAD "Enable MAD mp3 decoder support" ON )
+ option( WITH_ESOUND "Enable ESOUND support" OFF )
++option( WITH_JACK "Enable JACK support" OFF )
+ 
+ 
+ ##### paths setup ###############################
+@@ -163,6 +164,19 @@
+ endif( WITH_ESOUND )
+ 
+ 
++##### check for JACK ############################
++
++set( HAVE_LIBJACK 0 )
++if( WITH_JACK )
++  pkg_search_module( LIBJACK jack )
++  if( LIBJACK_FOUND )
++    set( HAVE_LIBJACK 1 )
++  else( LIBJACK_FOUND )
++    message(FATAL_ERROR "\nJACK support is requested, but `jack.pc` was not found" )
++  endif( LIBJACK_FOUND )
++endif( WITH_JACK )
++
++
+ ##### check for glib/gthread modules ############
+ 
+ pkg_search_module( GLIB2 glib-2.0 )
+diff -Nuar arts.ORI/config.h.cmake arts/config.h.cmake
+--- arts.ORI/config.h.cmake	2011-12-16 20:58:30.000000000 +0100
++++ arts/config.h.cmake	2011-12-16 20:59:24.095343176 +0100
+@@ -34,3 +34,5 @@
+ #cmakedefine HAVE_SYS_SOUNDCARD_H 1
+ #cmakedefine HAVE_LIBPTHREAD 1
+ #define HAVE_IOCTL_INT_ULONGINT_DOTS 3
++
++#cmakedefine HAVE_LIBJACK 1
+diff -Nuar arts.ORI/flow/CMakeLists.txt arts/flow/CMakeLists.txt
+--- arts.ORI/flow/CMakeLists.txt	2011-12-16 21:00:29.000000000 +0100
++++ arts/flow/CMakeLists.txt	2011-12-16 21:02:29.831594171 +0100
+@@ -66,7 +66,7 @@
+ tde_add_library( ${target} SHARED
+   SOURCES ${${target}_SRCS}
+   VERSION 1.0.0
+-  LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES}
++  LINK artsgsl-static artsgslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES} ${LIBJACK_LIBRARIES}
+   DESTINATION ${LIB_INSTALL_DIR}
+ )
+ 
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index 297db868e..7e032efef 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 3
+%define release 4
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -32,6 +32,9 @@ Source0:	arts-%{version}.tar.gz
 # TDE 3.5.13: Re-enable lost OSS support
 Patch0:		arts-3.5.13-enable_oss.patch
 
+# TDE 3.5.13: Re-enable lost JACK support
+Patch1:		arts-3.5.13-enable_jack.patch
+
 BuildRequires:	tqtinterface-devel
 BuildRequires:	audiofile-devel
 BuildRequires:	alsa-lib-devel
@@ -39,9 +42,10 @@ BuildRequires:	glib2-devel
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	gsl-devel
 BuildRequires:	libvorbis-devel
+BuildRequires:	jack-audio-connection-kit-devel
 
-Requires:	tqtinterface
-Requires:	audiofile
+Requires:		tqtinterface
+Requires:		audiofile
 
 %if "%{?_prefix}" == "/usr"
 Obsoletes:	arts
@@ -74,6 +78,7 @@ Development files for %{name}
 %prep
 %setup -q -n dependencies/arts
 %patch0 -p1
+%patch1 -p1
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -88,9 +93,9 @@ cd build
   -DWITH_VORBIS=ON \
   -DWITH_MAD=OFF \
   -DWITH_ESOUND=ON \
+  -DWITH_JACK=ON \
   ..
 
-#cp -f /tmp/config.h .
 
 %__make %{?_smp_mflags}
 
@@ -131,6 +136,9 @@ cd build
 
 
 %changelog
+* Fri Dec 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Enables JACK support
+
 * Mon Nov 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
 - Enables OSS and ESD support