* starts packaging naming tde-* (eg. tde-kdelibs)
v3.5.13-sru
Robert Xu 13 years ago
parent 47a0aa4601
commit 6af7d95a69

@ -0,0 +1,25 @@
Index: mcop/objectmanager.cc
===================================================================
--- mcop/objectmanager.cc.orig
+++ mcop/objectmanager.cc
@@ -28,6 +28,7 @@
#include "extensionloader.h"
#include "debug.h"
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#include <iostream>
@@ -267,6 +268,12 @@ bool ObjectManager::addGlobalReference(O
string ObjectManager::getGlobalReference(const string& name)
{
+ static bool started_arts = false;
+ if (!started_arts)
+ {
+ system("arts-start");
+ started_arts = true;
+ }
return Dispatcher::the()->globalComm().get(name);
}

@ -0,0 +1,27 @@
Index: flow/gsl/gslloader.c
===================================================================
--- flow/gsl/gslloader.c.orig
+++ flow/gsl/gslloader.c
@@ -313,7 +313,8 @@ gsl_wave_chunk_create (GslWaveDsc *wav
/* FIXME: we essentially create a dcache for each wchunk here ;( */
- dcache = gsl_data_cache_from_dhandle (dhandle, gsl_get_config ()->wave_chunk_padding * wave_dsc->n_channels);
+ /* dcache = gsl_data_cache_from_dhandle (dhandle, gsl_get_config ()->wave_chunk_padding * wave_dsc->n_channels); */
+ dcache = gsl_data_cache_from_dhandle (dhandle, 0); /* FIXME: padding is bad for vorbis... */
gsl_data_handle_unref (dhandle);
if (!dcache)
return NULL;
Index: flow/gsl/gslcommon.c
===================================================================
--- flow/gsl/gslcommon.c.orig
+++ flow/gsl/gslcommon.c
@@ -1585,7 +1585,7 @@ gsl_init (const GslConfigValue values[],
1, /* n_processors */
2, /* wave_chunk_padding */
4, /* wave_chunk_big_pad */
- 512, /* dcache_block_size */
+ 8192, /* dcache_block_size */
1024 * 1024, /* dcache_cache_memory */
69, /* midi_kammer_note */
440, /* kammer_freq */

File diff suppressed because it is too large Load Diff

@ -0,0 +1,174 @@
#
# spec file for package arts
#
# Copyright (c) 2011 the Trinity Project (opensuse).
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.trinitydesktop.org/
#
# norootforbuild
Name: arts
BuildRequires: alsa-devel audiofile-devel glib2-devel jack-devel libdrm-devel libjpeg-devel libvorbis-devel libtqt4-devel readline-devel update-desktop-files
BuildRequires: tde-filesystem
Requires: tde-filesystem
License: GPLv2+
Group: Productivity/Multimedia/Sound/Players
Summary: Modular Software Synthesizer
PreReq: permissions
Version: 3.5.12.99
Release: 1
Source0: %{name}-%{version}.tar.bz2
Source1: artswrapper.7.gz
Source2: baselibs.conf
Patch2: no-informational-messages.diff
Patch5: arts-vorbis-fix.dif
Patch7: fortify_source.patch
Patch8: arts-start-on-demand.diff
Patch9: avoid_la_files.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A modular software synthesizer that generates realtime audio streams,
includes midi support, is easily extendable, and uses CORBA for
separation of GUI and synthesis.
Authors:
--------
Stefan Westerfeld <stefan@space.twc.de>
%package devel
License: GPLv2+
# usefiles /opt/tde/bin/artsc-config /opt/tde/bin/mcopidl
Summary: Include Files and Libraries mandatory for Development.
Group: Development/Libraries/Other
Provides: tde-kdelibs:/opt/tde/include/artsc/artsc.h
Requires: libtqt4-devel arts = %version glib2-devel jack-devel libogg-devel libvorbis-devel audiofile-devel libstdc++-devel
Requires: alsa-devel
%description devel
A modular software synthesizer that generates realtime audio streams,
supports MIDI, is easily extendable, and uses CORBA for separation of
the GUI and synthesis.
Authors:
--------
Stefan Westerfeld <stefan@space.twc.de>
%package gmcop
License: GPLv2+
# usesubdirs gmcop
Summary: A Modular Software Synthesizer
Group: Productivity/Multimedia/Sound/Players
%description gmcop
A modular software synthesizer that generates real-time audio streams,
supports midi, is easily extendable, and uses CORBA for separation of
GUI and synthesis.
Authors:
--------
Stefan Westerfeld <stefan@space.twc.de>
%prep
%setup -q
%patch2
%patch5
%patch7
%patch8
%patch9
%build
CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DNDEBUG" CFLAGS="$CXXFLAGS" %cmake_tde -d=build
#%ifarch %ix86
# I trust in arts runtime checking ...
#echo "#define HAVE_X86_SSE 1" >> config.h
#%endif
# broken automake ?
#make -C flow/gsl gslconfig.h
# broken automake ?
#make %{?jobs:-j%jobs}
%make_jobs
%install
%tde_makeinstall
%ifarch x86_64
mkdir -p $RPM_BUILD_ROOT/%{_tde_libdir}
ln -sf ../lib64/mcop $RPM_BUILD_ROOT/%{_tde_libdir}/mcop
%endif
mkdir -p -m 755 $RPM_BUILD_ROOT/%_mandir/man7
cp %SOURCE1 $RPM_BUILD_ROOT/%_mandir/man7/
%clean
rm -rf $RPM_BUILD_ROOT
%post
%run_ldconfig
%run_permissions
%postun
%run_ldconfig
%post gmcop
%run_ldconfig
%postun gmcop
%run_ldconfig
%verifyscript
%verify_permissions -e %{_tde_bindir}/artswrapper
%files
%defattr(-,root,root,755)
%doc COPYING.LIB COPYING
%dir %{_tde_prefix}
%dir %{_tde_bindir}
%{_tde_bindir}/artscat
%{_tde_bindir}/arts[dpsr]*
%verify(not mode) %{_tde_bindir}/artswrapper
%dir /opt/kde3/%_lib
%{_tde_libdir}/libarts*.so.*
%{_tde_libdir}/libkmedia2*.so.*
%{_tde_libdir}/libmcop.so.*
%{_tde_libdir}/libmcop_mt.so.*
%{_tde_libdir}/libqtmcop.so.*
%{_tde_libdir}/libsoundserver_idl.so.*
%{_tde_libdir}/libx11globalcomm.so.*
# these need to be in the base package for lt_dlopen()
%{_tde_libdir}/*.so
%{_tde_libdir}/mcop
%ifarch x86_64
/opt/tde/lib
%endif
%{_mandir}/man7/artswrapper.7.gz
%files gmcop
%defattr(-,root,root)
%{_tde_libdir}/libgmcop.so.*
%files devel
%defattr(-,root,root)
%{_tde_bindir}/artsc-config
%{_tde_bindir}/mcopidl
%dir %{_tde_includedir}
%{_tde_includedir}/*
%{_tde_libdir}/*.la
%changelog

Binary file not shown.

@ -0,0 +1,26 @@
--- artsc/Makefile.am
+++ artsc/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -DARTSC_BACKEND='"$(libdir)/libartscbackend.la"'
+AM_CFLAGS = -DARTSC_BACKEND='"$(libdir)/libartscbackend.so"'
AM_CPPFLAGS = -DCOMPILING_ARTSC
lib_LTLIBRARIES = libartsc.la libartscbackend.la libartsdsp.la libartsdsp_st.la
FLOWLIBS = $(top_builddir)/flow/libartsflow.la
--- mcop/extensionloader.cc
+++ mcop/extensionloader.cc
@@ -56,7 +56,14 @@
/* this will catch all startup classes here */
StartupManager::setExtensionLoader(this);
- lt_dlinit();
+ lt_dlinit();
+
+ string::size_type len = dlfilename.length();
+ if (len > 0 && dlfilename[len-1] == 'a' && dlfilename[len-2] == 'l') {
+ dlfilename[len-1] = 'o';
+ dlfilename[len-2] = 's';
+ }
+
handle = lt_dlopen(dlfilename.c_str());
StartupManager::setExtensionLoader(0);

@ -0,0 +1,13 @@
Index: flow/gsl/gslloader-oggvorbis.c
===================================================================
--- flow/gsl/gslloader-oggvorbis.c.orig
+++ flow/gsl/gslloader-oggvorbis.c
@@ -25,7 +25,7 @@
#include <vorbis/vorbisfile.h>
#include <string.h>
#include <unistd.h>
-
+#include <string.h>
/* --- structures --- */
typedef struct

@ -0,0 +1,15 @@
Index: mcop/debug.cc
===================================================================
RCS file: /home/kde/arts/mcop/debug.cc,v
retrieving revision 1.14
diff -u -3 -p -r1.14 debug.cc
--- mcop/debug.cc 13 Oct 2003 19:59:41 -0000 1.14
+++ mcop/debug.cc 24 Feb 2004 17:07:40 -0000
@@ -92,7 +92,6 @@ static void output_message(Debug::Level
buff = arts_strdup_printf("%s -w 'Sound server warning message:\n\n%s' &", messageAppName, quoted_msg);
break;
case Debug::lInfo:
- buff = arts_strdup_printf("%s -i 'Sound server informational message:\n\n%s' &", messageAppName, quoted_msg);
break;
default:
break; // avoid compile warning

@ -38,7 +38,7 @@ Requires: qt3 >= 3.3.8c
%if %{with_qt4}
BuildRequires: libqt4-devel >= 4.7.0
BuildRequires: libqt4-x11 >= 4.7.0
Requires: libqt4-x11 >= 4.7.0
%endif
BuildRequires: cmake
@ -68,6 +68,7 @@ Authors:
Summary: TQtinterface header files
Group: Graphical Desktop/TDE
Requires: libtqt4
Requires: qt3 >= 3.3.8c
%description devel
This package contains Trinity KDE specific window options and commands.
You need this package to compile Trinity modules. (TQT headers)

@ -53,7 +53,7 @@
cmake -DCMAKE_SKIP_RPATH=ON \\\
-DCMAKE_INSTALL_PREFIX=%{_tde_prefix} \\\
-DCMAKE_INSTALL_LIBDIR:PATH=%{_tde_libdir} \\\
      -DINCLUDE_INSTALL_DIR:PATH=%{_tde_prefix}/include \\\
      -DINCLUDE_INSTALL_DIR:PATH=%{_tde_includedir} \\\
-DLIB_INSTALL_DIR:PATH=%{_tde_libdir} \\\
-DLIBEXEC_INSTALL_DIR:PATH=%{_tde_libexecdir} \\\
-DLIB_SUFFIX="$_tde_libsuffix" \\\

Loading…
Cancel
Save