Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

8 files changed, 41 insertions, 782 deletions

diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 184c5b24b..781df345c 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -15,28 +15,27 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific variables
+# TDE variables
 %define tde_version 14.0.0
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_datadir %{tde_prefix}/share
-
 %define tde_tdeincludedir %{tde_includedir}/tde
-
 %define _docdir %{tde_datadir}/doc
 
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+
 Name:		trinity-arts
-Epoch:		1
+Epoch:		2
 Version:	1.5.10
 Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-Summary:	aRts (analog realtime synthesizer) - the TDE sound system
+Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
 Group:		System Environment/Daemons 
 URL:		http://www.trinitydesktop.org/
 
@@ -54,7 +53,9 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	libtqt4-devel >= 1:4.2.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
+BuildRequires:	trinity-filesystem >= %{tde_version}
+Requires:		trinity-filesystem >= %{tde_version}
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
@@ -117,7 +118,7 @@ BuildRequires:		libmad-devel
 %define with_pulseaudio 1
 %endif
 
-Requires:		libtqt4 >= 1:4.2.0
+Requires:		libtqt4 >= 2:4.2.0
 Requires:		audiofile
 
 %if "%{?tde_prefix}" == "/usr"
@@ -139,17 +140,8 @@ playing a wave file with some effects.
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
-%dir %{tde_prefix}
-%dir %{tde_bindir}
-%dir %{tde_datadir}
-%dir %{tde_datadir}/config
-%dir %{tde_datadir}/doc
-%dir %{tde_libdir}
 %dir %{tde_libdir}/mcop
 %dir %{tde_libdir}/mcop/Arts
-%dir %{tde_libdir}/pkgconfig
-%dir %{tde_includedir}
-%dir %{tde_tdeincludedir}
 %{tde_libdir}/mcop/Arts/*
 %{tde_libdir}/mcop/*.mcopclass
 %{tde_libdir}/mcop/*.mcoptype
@@ -174,12 +166,39 @@ playing a wave file with some effects.
 
 %package devel
 Group:		Development/Libraries
-Summary:	aRts (analog realtime synthesizer) - the TDE sound system (Development files)
+Summary:	ARTS (analog realtime synthesizer) - the TDE sound system (Development files)
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{?tde_prefix}" == "/usr"
 Obsoletes:	arts-devel
 %endif
 
+Requires:	alsa-lib-devel
+Requires:	audiofile-devel
+Requires:	libvorbis-devel
+Requires:	esound-devel
+
+%if 0%{?with_libmad}
+%if 0%{?mdkversion} || 0%{?mgaversion}
+Requires:		%{_lib}mad-devel
+%endif
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+Requires:		libmad-devel
+%endif
+%endif
+
+%if 0%{?with_jack}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:	%{_lib}jack-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora}
+Requires:	jack-audio-connection-kit-devel
+%endif
+%if 0%{?suse_version}
+Requires:	libjack-devel
+%endif
+%endif
+
+
 %description devel
 arts (analog real-time synthesizer) is the sound system of TDE.
 
@@ -236,7 +255,6 @@ Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 ##########
 
-
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
diff --git a/redhat/dependencies/arts/arts-3.5.12.spec b/redhat/dependencies/arts/arts-3.5.12.spec
deleted file mode 100644
index 1a72133d6..000000000
--- a/redhat/dependencies/arts/arts-3.5.12.spec
+++ /dev/null
@@ -1,153 +0,0 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.12
-%endif
-%define release 6
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires:	autoconf automake libtool m4
-
-
-Name:		trinity-arts
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-License:	GPL
-Summary:	aRts (analog realtime synthesizer) - the KDE sound system
-Group:		System Environment/Daemons 
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <[email protected]>
-
-Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	arts-%{version}.tar.gz
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	glib2-devel
-BuildRequires:	libtool-ltdl-devel
-BuildRequires:	gsl-devel
-
-Requires:	tqtinterface
-Requires:	audiofile
-
-%if "%{?_prefix}" == "/usr"
-Obsoletes:	arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-%if "%{?_prefix}" == "/usr"
-Obsoletes:	arts-devel
-%endif
-
-%description devel
-Development files for %{name}
-
-%prep
-%setup -q -n dependencies/arts
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-  --disable-rpath \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking \
-  --enable-new-ldflags \
-  --disable-libmad \
-  --with-alsa \
-  --enable-final \
-  --enable-closure \
-  --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{_libdir}/mcop
-%dir %{_libdir}/mcop/Arts
-%{_libdir}/mcop/Arts/*
-%{_libdir}/mcop/*.mcopclass
-%{_libdir}/mcop/*.mcoptype
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.la
-%{_bindir}/artscat
-%{_bindir}/artsd
-%{_bindir}/artsdsp
-%{_bindir}/artsplay
-%{_bindir}/artsrec
-%{_bindir}/artsshell
-%{_bindir}/artswrapper
-
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/mcopidl
-%dir %{_includedir}
-%{_includedir}/arts/
-%{_includedir}/artsc/
-%{_bindir}/artsc-config
-%{_libdir}/lib*.so
-
-
-%changelog
-* Fri Sep 16 2011 Francois Andriot <[email protected]> - 3.5.12-6
-- Add support for RHEL 5.
-
-* Mon Sep 12 2011 Francois Andriot <[email protected]> - 3.5.12-5
-- Add "Group" field
-
-* Sun Sep 04 2011 Francois Andriot <[email protected]> - 3.5.12-4
-- Import to GIT
-- Removes cmake stuff, build with autotools only
-
-* Mon Aug 22 2011 Francois Andriot <[email protected]> - 3.5.12-3
-- Correct macro to install under "/opt", if desired
-
-* Sat Dec 18 2010  Francois Andriot <[email protected]> - 3.5.12-2
-- Add cmake support
-- Add some BuildRequires
-
-* Fri Dec 17 2010 Francois Andriot <[email protected]> - 3.5.12-1
-- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/trinity)
-- Add '--with-extra-includes=%{_includedir}/tqt'
-
-* Tue Dec 07 2010 Francois Andriot <[email protected]> - 3.5.12-0
-- Initial version
-
diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch b/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch
deleted file mode 100644
index 28dfa50a5..000000000
--- a/redhat/dependencies/arts/arts-3.5.13-enable_jack.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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/arts-3.5.13-enable_oss.patch b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
deleted file mode 100644
index ca89ed76c..000000000
--- a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -Nuar arts.ORI/artsc/CMakeLists.txt arts.PATCHED/artsc/CMakeLists.txt
---- arts.ORI/artsc/CMakeLists.txt	2011-06-12 07:57:03.000000000 +0200
-+++ arts.PATCHED/artsc/CMakeLists.txt	2011-11-14 21:53:12.000000000 +0100
-@@ -43,6 +43,7 @@
- include_directories(
-   ${CMAKE_CURRENT_BINARY_DIR}
-   ${CMAKE_BINARY_DIR}
-+  ${CMAKE_SOURCE_DIR}/artsc
-   ${CMAKE_BINARY_DIR}/mcop
-   ${CMAKE_SOURCE_DIR}/mcop
-   ${CMAKE_BINARY_DIR}/flow
-@@ -64,7 +65,7 @@
- tde_add_library( artsdsp SHARED
-   SOURCES artsdsp.c
-   VERSION 0.0.0
--  LINK artsc-shared
-+  LINK artsc-shared dl
-   DESTINATION ${LIB_INSTALL_DIR}
- )
- 
-diff -Nuar arts.ORI/CMakeLists.txt arts.PATCHED/CMakeLists.txt
---- arts.ORI/CMakeLists.txt	2011-03-28 04:09:15.000000000 +0200
-+++ arts.PATCHED/CMakeLists.txt	2011-11-14 21:53:46.000000000 +0100
-@@ -33,6 +33,7 @@
- option( WITH_AUDIOFILE "Enable audiofile (wav) support" ON )
- option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )
- option( WITH_MAD "Enable MAD mp3 decoder support" ON )
-+option( WITH_ESOUND "Enable ESOUND support" OFF )
- 
- 
- ##### paths setup ###############################
-@@ -58,6 +59,8 @@
- check_include_file( "malloc.h" HAVE_MALLOC_H )
- check_include_file( "memory.h" HAVE_MEMORY_H )
- check_include_file( "dlfcn.h" HAVE_DLFCN_H )
-+check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
-+check_include_file( "pthread.h" HAVE_LIBPTHREAD )
- 
- 
- ##### check for system libraries ################
-@@ -145,6 +148,21 @@
- endif( WITH_ALSA )
- 
- 
-+##### check for esound #######################
-+
-+set( HAVE_LIBESD 0 )
-+if( WITH_ESOUND )
-+
-+  pkg_search_module( ESOUND esound )
-+  if( ESOUND_FOUND )
-+    set( HAVE_LIBESD 1 )
-+  else( ESOUND_FOUND )
-+    message(FATAL_ERROR "\nESOUND support is requested, but `libesd` not found" )
-+  endif( ESOUND_FOUND )
-+
-+endif( WITH_ESOUND )
-+
-+
- ##### check for glib/gthread modules ############
- 
- pkg_search_module( GLIB2 glib-2.0 )
-diff -Nuar arts.ORI/config.h.cmake arts.PATCHED/config.h.cmake
---- arts.ORI/config.h.cmake	2010-10-12 03:53:06.000000000 +0200
-+++ arts.PATCHED/config.h.cmake	2011-11-14 22:00:50.000000000 +0100
-@@ -23,8 +23,14 @@
- 
- #cmakedefine HAVE_LIBAUDIOFILE 1
- 
-+#cmakedefine HAVE_LIBESD 1
-+
- #cmakedefine HAVE_LIBASOUND2 1
- #cmakedefine HAVE_ALSA_ASOUNDLIB_H 1
- #cmakedefine HAVE_SND_PCM_RESUME 1
- #cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1
- #cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1
-+
-+#cmakedefine HAVE_SYS_SOUNDCARD_H 1
-+#cmakedefine HAVE_LIBPTHREAD 1
-+#define HAVE_IOCTL_INT_ULONGINT_DOTS 3
-diff -Nuar arts.ORI/flow/CMakeLists.txt arts.PATCHED/flow/CMakeLists.txt
---- arts.ORI/flow/CMakeLists.txt	2011-10-04 04:01:15.000000000 +0200
-+++ arts.PATCHED/flow/CMakeLists.txt	2011-11-14 21:53:12.000000000 +0100
-@@ -15,6 +15,7 @@
- 
- include_directories(
-   ${CMAKE_BINARY_DIR}
-+  ${CMAKE_SOURCE_DIR}/artsc
-   ${CMAKE_BINARY_DIR}/mcop
-   ${CMAKE_SOURCE_DIR}/mcop
-   ${CMAKE_CURRENT_BINARY_DIR}
-diff -Nuar arts.ORI/mcop/CMakeLists.txt arts.PATCHED/mcop/CMakeLists.txt
---- arts.ORI/mcop/CMakeLists.txt	2010-10-12 03:53:05.000000000 +0200
-+++ arts.PATCHED/mcop/CMakeLists.txt	2011-11-14 22:04:29.000000000 +0100
-@@ -12,11 +12,11 @@
- configure_file( arts_export.h.in arts_export.h )
- 
- if( NOT EXTENSION_DIR )
--  set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib )
-+  set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
- endif( NOT EXTENSION_DIR )
- 
- if( NOT DTRADER_DIR )
--  set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib/mcop )
-+  set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/mcop )
- endif( NOT DTRADER_DIR )
- 
- add_definitions(
-@@ -66,6 +66,6 @@
- tde_add_library( ${target} SHARED
-   SOURCES ${${target}_SRCS}
-   VERSION 1.0.0
--  LINK ltdlc-static
-+  LINK ltdlc-static ${ESOUND_LIBRARIES}
-   DESTINATION ${LIB_INSTALL_DIR}
- )
-diff -Nuar arts.ORI/mcop_mt/CMakeLists.txt arts.PATCHED/mcop_mt/CMakeLists.txt
---- arts.ORI/mcop_mt/CMakeLists.txt	2010-10-12 03:53:05.000000000 +0200
-+++ arts.PATCHED/mcop_mt/CMakeLists.txt	2011-11-14 21:53:12.000000000 +0100
-@@ -11,6 +11,11 @@
- 
- include_directories(
-   ${CMAKE_BINARY_DIR}
-+  ${CMAKE_BINARY_DIR}/flow
-+  ${CMAKE_BINARY_DIR}/mcop
-+  ${CMAKE_SOURCE_DIR}/flow
-+  ${CMAKE_SOURCE_DIR}/mcop
-+  ${GLIB2_INCLUDE_DIRS}
- )
- 
- 
-@@ -19,6 +24,6 @@
- tde_add_library( mcop_mt SHARED
-   SOURCES threads_posix.cc
-   VERSION 1.0.0
--  LINK artsflow-shared
-+  LINK artsflow-shared pthread
-   DESTINATION ${LIB_INSTALL_DIR}
- )
diff --git a/redhat/dependencies/arts/arts-3.5.13.1.spec b/redhat/dependencies/arts/arts-3.5.13.1.spec
deleted file mode 100644
index 4b5f276a4..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.1.spec
+++ /dev/null
@@ -1,182 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeincludedir %{tde_includedir}/tde
-
-%define _docdir %{tde_prefix}/share/doc
-
-Name:		trinity-arts
-Version:	3.5.13.1
-Release:	1%{?dist}%{?_variant}
-License:	GPL
-Summary:	aRts (analog realtime synthesizer) - the KDE sound system
-Group:		System Environment/Daemons 
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <[email protected]>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	arts-3.5.13.1.tar.gz
-
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gsl-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	esound-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	jack-audio-connection-kit-devel
-BuildRequires:	libtool-ltdl-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libjack-devel
-BuildRequires:	libltdl-devel
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-
-Requires:		trinity-tqtinterface >= %{version}
-Requires:		audiofile
-
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{tde_libdir}/mcop
-%dir %{tde_libdir}/mcop/Arts
-%{tde_libdir}/mcop/Arts/*
-%{tde_libdir}/mcop/*.mcopclass
-%{tde_libdir}/mcop/*.mcoptype
-%{tde_libdir}/lib*.so.*
-%{tde_bindir}/artscat
-%{tde_bindir}/artsd
-%{tde_bindir}/artsdsp
-%{tde_bindir}/artsplay
-%{tde_bindir}/artsrec
-%{tde_bindir}/artsshell
-%{tde_bindir}/artswrapper
-# The '.la' files are runtime, not devel !
-%{tde_libdir}/lib*.la
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts-devel
-%endif
-
-%description devel
-Development files for %{name}
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/mcopidl
-# Arts includes are under 'tde' - this is on purpose !
-%{tde_tdeincludedir}/arts/
-# Artsc includes are not under 'tde'.
-%{tde_includedir}/artsc/
-%{tde_bindir}/artsc-config
-%{tde_libdir}/lib*.so
-%{tde_libdir}/pkgconfig/*.pc
-%{tde_libdir}/*.a
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n arts-3.5.13.1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir}/arts \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-  -DWITH_ALSA=ON \
-  -DWITH_AUDIOFILE=ON \
-  -DWITH_VORBIS=ON \
-  -DWITH_MAD=OFF \
-  -DWITH_ESOUND=ON \
-%if 0%{?rhel} == 4
-  -DWITH_JACK=OFF \
-%else
-  -DWITH_JACK=ON \
-%endif
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install -C build DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Tue Sep 11 2012 Francois Andriot <[email protected]> - 3.5.13.1-1
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/dependencies/arts/arts-3.5.13.2-debug.patch b/redhat/dependencies/arts/arts-3.5.13.2-debug.patch
deleted file mode 100644
index 1925292ab..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.2-debug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- trinity-arts-3.5.13.2~pre15+85a8c7ad/flow/audioionull.cc.ORI	2013-05-26 13:35:39.081803512 +0200
-+++ trinity-arts-3.5.13.2~pre15+85a8c7ad/flow/audioionull.cc	2013-05-26 13:36:02.342333674 +0200
-@@ -133,6 +133,9 @@
- 		if((_direction & directionWrite) && getParam(canWrite) >= _fragmentSize)
- 			todo |= AudioSubSystem::ioWrite;
- 
-+		fprintf(stderr, "AudioIO: can write %d, fragment size %d, todo %d\n",
-+			getParam(canWrite), _fragmentSize, todo);
-+
- 		if(!todo)
- 			return;
- 
diff --git a/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch b/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch
deleted file mode 100644
index c60be93f0..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.2-fix_esd_buffer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nuar trinity-arts-3.5.13.2.ORI/flow/audioioesd.cc trinity-arts-3.5.13.2.P/flow/audioioesd.cc
---- trinity-arts-3.5.13.2.ORI/flow/audioioesd.cc	2013-04-08 19:05:22.665624664 +0200
-+++ trinity-arts-3.5.13.2.P/flow/audioioesd.cc	2013-04-08 23:58:07.905872271 +0200
-@@ -204,14 +204,10 @@
- 		return write_fd;
- 
- 	case canRead:
--		return ESD_BUF_SIZE;
-+		return param(fragmentSize);
- 
- 	case canWrite:
--		return ESD_BUF_SIZE;
--
--		// ESD handles are actually socket descriptors, and I know not
--		// of any portable way to peek at the socket's send or receive
--		// buffers.
-+		return param(fragmentSize);
- 
- 	default:
- 		return param(p);
diff --git a/redhat/dependencies/arts/arts-3.5.13.spec b/redhat/dependencies/arts/arts-3.5.13.spec
deleted file mode 100644
index af9fef33a..000000000
--- a/redhat/dependencies/arts/arts-3.5.13.spec
+++ /dev/null
@@ -1,201 +0,0 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-
-%define tde_tdeincludedir %{tde_includedir}/kde
-
-%define _docdir %{tde_prefix}/share/doc
-
-Name:		trinity-arts
-Version:	3.5.13
-Release:	4%{?dist}%{?_variant}
-License:	GPL
-Summary:	aRts (analog realtime synthesizer) - the KDE sound system
-Group:		System Environment/Daemons 
-
-Vendor:		Trinity Project
-URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <[email protected]>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-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 >= %{version}
-BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
-BuildRequires:	glib2-devel
-BuildRequires:	gsl-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	esound-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}jack-devel
-BuildRequires:	%{_lib}ltdl-devel
-%endif
-%if 0%{?rhel} >= 5
-BuildRequires:	jack-audio-connection-kit-devel
-BuildRequires:	libtool-ltdl-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libjack-devel
-BuildRequires:	libltdl-devel
-%endif
-
-# TDE 3.5.13 specific building variables
-BuildRequires: cmake >= 2.8
-
-Requires:		tqtinterface
-Requires:		audiofile
-
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts
-%endif
-
-%description
-arts (analog real-time synthesizer) is the sound system of KDE 3.
-
-The principle of arts is to create/process sound using small modules which do
-certain tasks. These may be create a waveform (oscillators), play samples,
-filter data, add signals, perform effects like delay/flanger/chorus, or
-output the data to the soundcard.
-
-By connecting all those small modules together, you can perform complex
-tasks like simulating a mixer, generating an instrument or things like
-playing a wave file with some effects.
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB
-%dir %{tde_libdir}/mcop
-%dir %{tde_libdir}/mcop/Arts
-%{tde_libdir}/mcop/Arts/*
-%{tde_libdir}/mcop/*.mcopclass
-%{tde_libdir}/mcop/*.mcoptype
-%{tde_libdir}/lib*.so.*
-%{tde_bindir}/artscat
-%{tde_bindir}/artsd
-%{tde_bindir}/artsdsp
-%{tde_bindir}/artsplay
-%{tde_bindir}/artsrec
-%{tde_bindir}/artsshell
-%{tde_bindir}/artswrapper
-# The '.la' files are runtime, not devel !
-%{tde_libdir}/lib*.la
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-##########
-
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
-%if "%{?tde_prefix}" == "/usr"
-Obsoletes:	arts-devel
-%endif
-
-%description devel
-Development files for %{name}
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/mcopidl
-%{tde_tdeincludedir}/arts/
-%{tde_includedir}/artsc/
-%{tde_bindir}/artsc-config
-%{tde_libdir}/lib*.so
-%{tde_libdir}/pkgconfig/*.pc
-%{tde_libdir}/*.a
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-##########
-
-%if 0%{?suse_version}
-%debug_package
-%endif
-
-##########
-
-
-%prep
-%setup -q -n dependencies/arts
-%patch0 -p1
-%patch1 -p1
-
-%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
-
-%cmake \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/arts \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-  -DWITH_ALSA=ON \
-  -DWITH_AUDIOFILE=ON \
-  -DWITH_VORBIS=ON \
-  -DWITH_MAD=OFF \
-  -DWITH_ESOUND=ON \
-%if 0%{?rhel} == 4
-  -DWITH_JACK=OFF \
-%else
-  -DWITH_JACK=ON \
-%endif
-  -DCMAKE_SKIP_RPATH="OFF" \
-  ..
-
-
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install -C build DESTDIR=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%changelog
-* Fri Dec 16 2011 Francois Andriot <[email protected]> - 3.5.13-4
-- Enables JACK support
-
-* Mon Nov 14 2011 Francois Andriot <[email protected]> - 3.5.13-3
-- Enables OSS and ESD support
-
-* Thu Nov 03 2011 Francois Andriot <[email protected]> - 3.5.13-2
-- Add missing BuildRequires
-
-* Sun Oct 30 2011 Francois Andriot <[email protected]> - 3.5.13-1
-- Initial release for RHEL 6, RHEL 5 and Fedora 15
-
-* Fri Sep 02 2011 Francois Andriot <[email protected]> - 3.5.13-0
-- Import to GIT
-- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)