rpms/arts/devel arts-1.5.4-dlopenext.patch, NONE, 1.1 arts-1.5.5-kde#139445.patch, NONE, 1.1 arts-1.5.7-qtmcop-notifications-on-demand.patch, NONE, 1.1 kde-3.5-libtool-shlibext.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 arts.spec, 1.72, 1.73 gslconfig-wrapper.h, 1.1, 1.2 sources, 1.31, 1.32
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Jun 14 16:47:11 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/arts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29273
Modified Files:
.cvsignore arts.spec gslconfig-wrapper.h sources
Added Files:
arts-1.5.4-dlopenext.patch arts-1.5.5-kde#139445.patch
arts-1.5.7-qtmcop-notifications-on-demand.patch
kde-3.5-libtool-shlibext.patch
Log Message:
* Wed Jun 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:1.5.7-3
- cleanup gslconfig.h/multilib bits, -ia64, +sparc64/sparc
* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:1.5.7-2
- (re)add (experimental) libtool patches
* Mon Jun 04 2007 Than Ngo <than at redhat.com> - 6:1.5.7-1.fc7
- 1.5.7
arts-1.5.4-dlopenext.patch:
--- NEW FILE arts-1.5.4-dlopenext.patch ---
Index: arts-1.5.4/soundserver/FileInputStream.mcopclass
===================================================================
--- arts-1.5.4.orig/soundserver/FileInputStream.mcopclass
+++ arts-1.5.4/soundserver/FileInputStream.mcopclass
@@ -2,4 +2,4 @@ Interface=Arts::FileInputStream,Arts::In
Author="Stefan Westerfeld <stefan at space.twc.de>"
URL="http://www.arts-project.org"
Language=C++
-Library=libkmedia2.la
+Library=libkmedia2
Index: arts-1.5.4/soundserver/GSLPlayObject.mcopclass
===================================================================
--- arts-1.5.4.orig/soundserver/GSLPlayObject.mcopclass
+++ arts-1.5.4/soundserver/GSLPlayObject.mcopclass
@@ -3,5 +3,5 @@ Author="Hans Meine <hans_meine at gmx.net>"
URL="http://www.arts-project.org/"
Extension=wav,mp3,ogg
Language=C++
-Library=libartsgslplayobject.la
+Library=libartsgslplayobject
MimeType=audio/wav,audio/x-wav,audio/x-mp3,audio/x-mp1,audio/x-mp2,audio/vorbis,application/ogg
Index: arts-1.5.4/soundserver/WavPlayObject.mcopclass
===================================================================
--- arts-1.5.4.orig/soundserver/WavPlayObject.mcopclass
+++ arts-1.5.4/soundserver/WavPlayObject.mcopclass
@@ -3,5 +3,5 @@ Author="Stefan Westerfeld <stefan at space.
URL="http://www.arts-project.org"
Extension=wav
Language=C++
-Library=libartswavplayobject.la
+Library=libartswavplayobject
MimeType=audio/wav,audio/x-wav
Index: arts-1.5.4/mcop/extensionloader.cc
===================================================================
--- arts-1.5.4.orig/mcop/extensionloader.cc
+++ arts-1.5.4/mcop/extensionloader.cc
@@ -57,7 +57,7 @@ ExtensionLoader::ExtensionLoader(const s
StartupManager::setExtensionLoader(this);
lt_dlinit();
- handle = lt_dlopen(dlfilename.c_str());
+ handle = lt_dlopenext(dlfilename.c_str());
StartupManager::setExtensionLoader(0);
Index: arts-1.5.4/x11/X11GlobalComm.mcopclass
===================================================================
--- arts-1.5.4.orig/x11/X11GlobalComm.mcopclass
+++ arts-1.5.4/x11/X11GlobalComm.mcopclass
@@ -1,3 +1,3 @@
Language=C++
-Library=libx11globalcomm.la
+Library=libx11globalcomm
Interface=Arts::Object,Arts::GlobalComm,Arts::X11GlobalComm
arts-1.5.5-kde#139445.patch:
--- NEW FILE arts-1.5.5-kde#139445.patch ---
--- arts-1.5.5/mcop/Makefile.am.139445 2005-09-10 03:13:32.000000000 -0500
+++ arts-1.5.5/mcop/Makefile.am 2007-01-12 08:11:10.000000000 -0600
@@ -16,7 +16,9 @@
trader_impl.cc dynamicrequest.cc anyref.cc loopback.cc \
delayedreturn.cc thread.cc dynamicskeleton.cc
+CXXFLAGS += -fexceptions
libmcop_la_LIBADD = $(LIBSOCKET) $(GLIB_LIBADD) $(top_builddir)/libltdl/libltdlc.la
+libmcop_la_LIBADD += -lboost_filesystem -lboost_regex
libmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(GLIB_LDFLAGS) $(all_libraries)
artsincludedir = $(includedir)/arts
--- arts-1.5.5/mcop/extensionloader.cc.139445 2005-09-10 03:13:32.000000000 -0500
+++ arts-1.5.5/mcop/extensionloader.cc 2007-01-12 09:54:57.000000000 -0600
@@ -28,26 +28,62 @@
#include <unistd.h>
#include <assert.h>
+#include <boost/filesystem/exception.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/regex.hpp>
+
using namespace std;
using namespace Arts;
+static std::string makeLibraryName( std::string const& dir, std::string const& name )
+{
+ try
+ {
+ // std::string p = dir + "/" + name;
+ boost::regex p_regex;
+ p_regex.assign("(.+)\\.la$");
+ std::string p = dir + "/" + boost::regex_replace( name, p_regex, "$1", boost::match_default);
+
+ if ( boost::filesystem::exists( p + ".so" ) )
+ return ( p + ".so" );
+ boost::regex re( p + ".*so\\..+", boost::regex::extended );
+ for ( boost::filesystem::directory_iterator i( dir );
+ i != boost::filesystem::directory_iterator(); ++i )
+ {
+ boost::smatch m;
+ if ( boost::regex_match( i->string(), m, re ) )
+ return m.str();
+ }
+ return ( p + ".la" );
+ }
+ catch ( boost::filesystem::filesystem_error const& )
+ {
+ }
+ return std::string();
+}
+
ExtensionLoader::ExtensionLoader(const string& filename) :handle(0)
{
string dlfilename;
-
assert(filename.size());
- if(filename[0] == '/')
- dlfilename = filename;
- else
+ try
+ {
+ boost::filesystem::path p( filename );
+ if ( p.has_root_directory() )
+ dlfilename = makeLibraryName( p.branch_path().string(), p.leaf() );
+ }
+ catch ( boost::filesystem::filesystem_error const& )
+ {
+ }
+ if ( dlfilename.empty() )
{
const vector<string> *path = MCOPUtils::extensionPath();
vector<string>::const_iterator pi;
for(pi = path->begin(); pi != path->end(); pi++)
{
- dlfilename = *pi + "/" + filename;
-
- if(access(dlfilename.c_str(),F_OK) == 0)
+ dlfilename = makeLibraryName( *pi, filename );
+ if ( !dlfilename.empty() && ( access( dlfilename.c_str(), F_OK ) == 0 ) )
break;
}
}
arts-1.5.7-qtmcop-notifications-on-demand.patch:
--- NEW FILE arts-1.5.7-qtmcop-notifications-on-demand.patch ---
Index: mcop/notification.h
===================================================================
--- mcop/notification.h (Revision 667003)
+++ mcop/notification.h (Revision 667004)
@@ -72,10 +72,7 @@
{
return instance;
}
- inline void send(Notification wm)
- {
- todo.push(wm);
- }
+ void send(Notification wm);
inline bool pending()
{
return !todo.empty();
Index: mcop/iomanager.cc
===================================================================
--- mcop/iomanager.cc (Revision 667003)
+++ mcop/iomanager.cc (Revision 667004)
@@ -409,9 +409,15 @@
void StdIOManager::addTimer(int milliseconds, TimeNotify *notify)
{
- timeList.push_back(new TimeWatcher(milliseconds,notify));
- timeListChanged = true;
- Dispatcher::wakeUp();
+ if (milliseconds == -1 && notify == 0) {
+ // HACK: in order to not add a virtual function to IOManager we're calling addTimer with
+ // magic values. This call tells the ioManager that notifications are pending and
+ // NotificationManager::run() should get called soon.
+ } else {
+ timeList.push_back(new TimeWatcher(milliseconds,notify));
+ timeListChanged = true;
+ Dispatcher::wakeUp();
+ }
}
void StdIOManager::removeTimer(TimeNotify *notify)
Index: mcop/notification.cc
===================================================================
--- mcop/notification.cc (Revision 667003)
+++ mcop/notification.cc (Revision 667004)
@@ -22,6 +22,7 @@
#include "notification.h"
#include "debug.h"
+#include "dispatcher.h"
using namespace Arts;
@@ -41,6 +42,17 @@
instance = 0;
}
+void NotificationManager::send(Notification wm)
+{
+ if (todo.empty()) {
+ // HACK: in order to not add a virtual function to IOManager we're calling addTimer with
+ // magic values. This call tells the ioManager that notifications are pending and
+ // NotificationManager::run() should get called soon.
+ Arts::Dispatcher::the()->ioManager()->addTimer(-1, 0);
+ }
+ todo.push(wm);
+}
+
bool NotificationManager::run()
{
if(todo.empty()) return false;
Index: qtmcop/qiomanager.cc
===================================================================
--- qtmcop/qiomanager.cc (Revision 667003)
+++ qtmcop/qiomanager.cc (Revision 667004)
@@ -102,30 +102,13 @@
class HandleNotifications : public TimeNotify {
public:
- HandleNotifications()
- {
- Arts::Dispatcher::the()->ioManager()->addTimer(50, this);
- }
void notifyTime()
{
+ Arts::Dispatcher::the()->ioManager()->removeTimer(this);
NotificationManager::the()->run();
+ delete this;
}
- virtual ~HandleNotifications()
- {
- Arts::Dispatcher::the()->ioManager()->removeTimer(this);
- }
};
-
-class HandleNotificationsStartup :public StartupClass
-{
-public:
- void startup() { h = new HandleNotifications(); }
- void shutdown() { delete h; }
-private:
- HandleNotifications *h;
-};
-static HandleNotificationsStartup handleNotifications;
-
}
/*
@@ -237,6 +220,14 @@
void QIOManager::addTimer(int milliseconds, TimeNotify *notify)
{
+ if (milliseconds == -1 && notify == 0)
+ {
+ // HACK: in order to not add a virtual function to IOManager we're calling addTimer with
+ // magic values. This call tells the ioManager that notifications are pending and
+ // NotificationManager::run() should get called soon.
+ notify = new HandleNotifications();
+ milliseconds = 0;
+ }
timeList.push_back(new QTimeWatch(milliseconds,notify));
}
kde-3.5-libtool-shlibext.patch:
--- NEW FILE kde-3.5-libtool-shlibext.patch ---
Index: arts-1.5.4/acinclude.m4
===================================================================
--- arts-1.5.4.orig/acinclude.m4
+++ arts-1.5.4/acinclude.m4
@@ -12040,28 +12040,12 @@ fi
])# AC_LTDL_SYS_DLOPEN_DEPLIBS
AC_DEFUN([AC_LTDL_SHLIBEXT],
-[AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl
+[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])dnl
AC_CACHE_CHECK([which extension is used for shared libraries],
libltdl_cv_shlibext, [dnl
-(
- last=
- case "$host_os" in
- cygwin* | mingw*)
- last=".dll"
- ;;
- *)
- for spec in $library_names_spec; do
- last="$spec"
- done
- ;;
- esac
-changequote(, )
- echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest
-changequote([, ])
-)
-libltdl_cv_shlibext=`cat conftest`
-rm -f conftest
-])
+module=yes
+eval libltdl_cv_shlibext=$shrext
+ ])
if test -n "$libltdl_cv_shlibext"; then
AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",
[Define to the extension used for shared libraries, say, ".so". ])
Index: arts-1.5.4/libltdl/ltdl.m4
===================================================================
--- arts-1.5.4.orig/libltdl/ltdl.m4
+++ arts-1.5.4/libltdl/ltdl.m4
@@ -118,27 +118,11 @@ fi
])# AC_LTDL_SYS_DLOPEN_DEPLIBS
AC_DEFUN([AC_LTDL_SHLIBEXT],
-[AC_REQUIRE([AC_LTDL_SNARF_CONFIG])dnl
+[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])dnl
AC_CACHE_CHECK([which extension is used for shared libraries],
libltdl_cv_shlibext, [dnl
-(
- last=
- case "$host_os" in
- cygwin* | mingw*)
- last=".dll"
- ;;
- *)
- for spec in $library_names_spec; do
- last="$spec"
- done
- ;;
- esac
-changequote(, )
- echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest
-changequote([, ])
-)
-libltdl_cv_shlibext=`cat conftest`
-rm -f conftest
+module=yes
+eval libltdl_cv_shlibext=$shrext
])
if test -n "$libltdl_cv_shlibext"; then
AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 24 Jan 2007 10:42:43 -0000 1.28
+++ .cvsignore 14 Jun 2007 16:46:35 -0000 1.29
@@ -12,3 +12,4 @@
arts-1.5.3.tar.bz2
arts-1.5.4.tar.bz2
arts-1.5.6.tar.bz2
+arts-1.5.7.tar.bz2
Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/arts.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- arts.spec 15 May 2007 17:27:17 -0000 1.72
+++ arts.spec 14 Jun 2007 16:46:35 -0000 1.73
@@ -1,15 +1,15 @@
-%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
%define final 1
-%define qt_version 3.3.7
+%define qt_version 3.3.8
%define make_cvs 1
-Name: arts
+Name: arts
Summary: aRts (analog realtime synthesizer) - the KDE sound system
-Group: System Environment/Daemons
-Epoch: 8
-Version: 1.5.6
-Release: 4%{?dist}
+Group: System Environment/Daemons
+Epoch: 8
+Version: 1.5.7
+Release: 3%{?dist}
License: LGPL
Url: http://www.kde.org
@@ -23,11 +23,18 @@
Patch6: arts-1.4.0-glibc.patch
Patch7: arts-1.5.0-check_tmp_dir.patch
Patch8: arts-1.5.2-multilib.patch
-## Consider for inclusion
-# http://vir.homelinux.org/blog/index.php?/archives/41-PowerTOP-and-aRts.html
-Patch9: http://vir.homelinux.org/qtmcop-notifications-on-demand.patch
-BuildRequires: qt-devel >= 1:%{qt_version}
+# upstream patches
+Patch100: arts-1.5.7-qtmcop-notifications-on-demand.patch
+Patch101: arts-1.5.4-dlopenext.patch
+Patch93359: kde-3.5-libtool-shlibext.patch
+# http://bugs.kde.org/139445
+# http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/arts-extension_loader.patch?rev=1.2
+#Patch139445: arts-extension_loader.patch
+Patch139445: arts-1.5.5-kde#139445.patch
+BuildRequires: boost-devel
+
+BuildRequires: qt-devel
## Shouldn't be necessary, but some folks won't upgrade, unless we stiff-arm them. (-;
#global qt_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo 3.3)
#Requires: qt >= 1:%{qt_ver}
@@ -58,14 +65,13 @@
tasks like simulating a mixer, generating an instrument or things like
playing a wave file with some effects.
-
%package devel
Group: Development/Libraries
Summary: Development files for the aRts sound server
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: qt-devel
Requires: pkgconfig
-## those below can/should be omitted from future builds -- Rex
+## those below can/should be omitted from future(f8?) builds -- Rex
Requires: esound-devel
Requires: glib2-devel
Requires: libvorbis-devel
@@ -75,6 +81,7 @@
Install arts-devel if you intend to write applications using arts (such as
KDE applications using sound).
+
%prep
%setup -q
%patch1 -p1 -b .debug
@@ -84,6 +91,13 @@
%patch7 -p1 -b .check_tmp_dir
%patch8 -p1 -b .multilib
+# upstream patches
+%patch100 -p0 -b .qtmcop-notifications-on-demand
+%patch93359 -p1 -b .libtool-shlibext
+# experimental libtool patches
+%patch101 -p1 -b .dlopenext
+%patch139445 -p1 -b .kde#139445
+
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
@@ -146,10 +160,12 @@
%clean
rm -rf %{buildroot}
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root)
%dir %{_libdir}/mcop
@@ -178,6 +194,15 @@
%changelog
+* Wed Jun 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:1.5.7-3
+- cleanup gslconfig.h/multilib bits, -ia64, +sparc64/sparc
+
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:1.5.7-2
+- (re)add (experimental) libtool patches
+
+* Mon Jun 04 2007 Than Ngo <than at redhat.com> - 6:1.5.7-1.fc7
+- 1.5.7
+
* Tue May 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:1.5.6-4
- respin with higher release (for EVR upgrade paths)
Index: gslconfig-wrapper.h
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/gslconfig-wrapper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gslconfig-wrapper.h 15 May 2006 17:04:03 -0000 1.1
+++ gslconfig-wrapper.h 14 Jun 2007 16:46:35 -0000 1.2
@@ -3,10 +3,10 @@
*
* DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
-#if defined(__i386__)
+#if defined(__x86_64__)
+#include "gslconfig-x86_64.h"
+#elif defined(__i386__)
#include "gslconfig-i386.h"
-#elif defined(__ia64__)
-#include "gslconfig-ia64.h"
#elif defined(__powerpc64__)
#include "gslconfig-ppc64.h"
#elif defined(__powerpc__)
@@ -15,8 +15,10 @@
#include "gslconfig-s390x.h"
#elif defined(__s390__)
#include "gslconfig-s390.h"
-#elif defined(__x86_64__)
-#include "gslconfig-x86_64.h"
+#elif defined(__sparc64__)
+#include "gslconfig-sparc64.h"
+#elif defined(__sparc__)
+#include "gslconfig-sparc.h"
#else
#error "This arts-devel package does not work your architecture?"
#endif
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/arts/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 24 Jan 2007 10:42:43 -0000 1.31
+++ sources 14 Jun 2007 16:46:35 -0000 1.32
@@ -1 +1 @@
-e986393a5827499bbad04a00b797add0 arts-1.5.6.tar.bz2
+28ac10541e5d8daf9009f6af1f7857af arts-1.5.7.tar.bz2
More information about the fedora-extras-commits
mailing list