diff options
Diffstat (limited to 'redhat/dependencies')
5 files changed, 264 insertions, 3 deletions
diff --git a/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch new file mode 100644 index 000000000..ca89ed76c --- /dev/null +++ b/redhat/dependencies/arts/arts-3.5.13-enable_oss.patch @@ -0,0 +1,139 @@ +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/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec index 46ff718f6..297db868e 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 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -29,6 +29,9 @@ 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 + BuildRequires: tqtinterface-devel BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel @@ -70,6 +73,7 @@ Development files for %{name} %prep %setup -q -n dependencies/arts +%patch0 -p1 %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -79,9 +83,15 @@ cd build %cmake \ -DINCLUDE_INSTALL_DIR=%{_includedir}/arts \ -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ + -DWITH_ALSA=ON \ + -DWITH_AUDIOFILE=ON \ + -DWITH_VORBIS=ON \ -DWITH_MAD=OFF \ + -DWITH_ESOUND=ON \ .. +#cp -f /tmp/config.h . + %__make %{?_smp_mflags} %install @@ -121,6 +131,9 @@ cd build %changelog +* Mon Nov 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 +- Enables OSS and ESD support + * Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 - Add missing BuildRequires diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec new file mode 100644 index 000000000..27a167636 --- /dev/null +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec @@ -0,0 +1,87 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif +%define release 1 + +# 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.13 specific building variables +BuildRequires: cmake >= 2.8 +BuildRequires: qt3-devel >= 3.3.8d +Requires: qt3 >= 3.3.8d + + +Name: dbus-1-tqt +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} +License: GPL +Summary: Dbus TQT Interface +Group: System Environment/Libraries + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{version}.tar.gz + +# Fix for a nasty memleak in knetworkmanager +Patch0: dbus1tqt-3.5.13-memory_leak.patch + +BuildRequires: gcc-c++ +BuildRequires: dbus-devel +BuildRequires: tqtinterface-devel + +%description +Dbus TQT Interface + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +Group: Development/Libraries + +%description devel +Development files for %{name} + + +%prep +%setup -q -n dependencies/%{name} +#patch0 -p1 + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh + +%__mkdir build +cd build +%cmake .. +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_includedir} +%__make install DESTDIR=%{?buildroot} -C build + +%clean +%__rm -rf %{?buildroot} + +%files +%{_bindir}/dbusxml2qt3 +%{_libdir}/*.so.* + +%files devel +%{_includedir}/*.h +%{_libdir}/*.so +%{_libdir}/*.la +%{_libdir}/pkgconfig/*.pc + +%changelog +* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5, Fedora 15 and Fedora 16 + diff --git a/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch b/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch new file mode 100644 index 000000000..cae8fea03 --- /dev/null +++ b/redhat/dependencies/dbus-1-tqt/dbus1tqt-3.5.13-memory_leak.patch @@ -0,0 +1,16 @@ +--- dbus-1-tqt/tqdbusconnection.cpp.ORI 2011-11-11 20:37:57.684881138 +0100 ++++ dbus-1-tqt/tqdbusconnection.cpp 2011-11-11 20:40:33.910795465 +0100 +@@ -285,7 +285,12 @@ + + dbus_message_unref(msg); + +- return TQT_DBusMessage::fromDBusMessage(reply); ++ TQT_DBusMessage mess = TQT_DBusMessage::fromDBusMessage(reply); ++ ++ /* XXX fromDbusMessage do a ref(), avoid leaking */ ++ dbus_message_unref(reply); ++ ++ return mess; + } + + void TQT_DBusConnection::flush() const diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec index 9a2be3b1e..670a6f9d5 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -31,9 +31,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}.tar.gz BuildRequires: gcc-c++ -BuildRequires: dbus-qt-devel +BuildRequires: dbus-devel BuildRequires: tqtinterface-devel +Provides: dbus-qt + %description Dbus TQT Interface @@ -42,6 +44,7 @@ Dbus TQT Interface Requires: %{name} Summary: %{name} - Development files Group: Development/Libraries +Provides: dbus-qt-devel %description devel Development files for %{name} @@ -78,6 +81,9 @@ cd build %{_libdir}/pkgconfig/*.pc %changelog +* Tue Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 +- Updates BuildRequires + * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 |