rpms/arts/FC-3 arts-1.3.1-alsa.patch, NONE, 1.1 arts-1.3.92-glib2.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 arts.spec, 1.25, 1.26 sources, 1.16, 1.17 arts-1.2.0-glib2.patch, 1.2, NONE arts-1.2.2-pie.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Aug 10 20:42:23 UTC 2005
Author: wtogami
Update of /cvs/dist/rpms/arts/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv7122/FC-3
Modified Files:
.cvsignore arts.spec sources
Added Files:
arts-1.3.1-alsa.patch arts-1.3.92-glib2.patch
Removed Files:
arts-1.2.0-glib2.patch arts-1.2.2-pie.patch
Log Message:
auto-import arts-1.4.2-0.fc3.2 on branch FC-3 from arts-1.4.2-0.fc3.2.src.rpm
arts-1.3.1-alsa.patch:
audioioalsa.cc | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
--- NEW FILE arts-1.3.1-alsa.patch ---
--- arts-1.3.1/flow/audioioalsa.cc.orig 2004-11-19 19:32:07.977923623 +0100
+++ arts-1.3.1/flow/audioioalsa.cc 2004-11-19 19:42:47.977558161 +0100
@@ -358,12 +358,9 @@
case autoDetect:
/*
- * that the ALSA driver could be compiled doesn't say anything
- * about whether it will work (the user might be using an OSS
- * kernel driver) so we'll use a value less than the OSS one
- * here, because OSS will most certainly work (ALSA's OSS emu)
+ * alsa as default
*/
- return 5;
+ return 15;
break;
default:
arts-1.3.92-glib2.patch:
gsl/Makefile.am | 10 ++++++----
gsl/gsldefs.h | 5 +++++
gsl/gslengine.c | 2 +-
gsl/gslffttest.c | 3 +--
gsl/gslglib.h | 2 +-
gsl/gslmakefile.inc | 33 ++++++++++++++++++++++++---------
gsl/gsltests.c | 3 +--
gsl/gslwchunk.c | 3 +--
gslschedule.cc | 3 +--
9 files changed, 41 insertions(+), 23 deletions(-)
--- NEW FILE arts-1.3.92-glib2.patch ---
--- arts-1.3.92/flow/gsl/gslglib.h.glib 2003-07-10 14:14:17.000000000 +0200
+++ arts-1.3.92/flow/gsl/gslglib.h 2005-02-14 17:30:12.406094625 +0100
@@ -505,7 +505,7 @@
* glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
*/
#if !defined (G_VA_COPY)
-# if defined (__GNUC__) && ( defined (__PPC__) || defined (__s390__) ) && (defined (_CALL_SYSV) || defined (_WIN32) || defined (__s390__) )
+# if defined (__GNUC__) && ( defined (__PPC__) || defined (__s390__) || defined(__x86_64__) ) && (defined (_CALL_SYSV) || defined (_WIN32) || defined (__s390__) || defined(__x86_64__) )
# define G_VA_COPY(ap1, ap2) (*(ap1) = *(ap2))
# elif defined (G_VA_COPY_AS_ARRAY)
# define G_VA_COPY(ap1, ap2) g_memmove ((ap1), (ap2), sizeof (va_list))
--- arts-1.3.92/flow/gsl/gsldefs.h.glib 2003-03-14 18:28:09.000000000 +0100
+++ arts-1.3.92/flow/gsl/gsldefs.h 2005-02-14 17:30:12.407094477 +0100
@@ -21,7 +21,12 @@
/* configure checks */
#include <gsl/gslconfig.h>
+
+#if GSL_USE_GSL_GLIB
+#include <gsl/gslglib.h> /* GSL just uses a certain subset of GLib */
+#else
#include <glib.h>
+#endif
#ifdef __cplusplus
extern "C" {
--- arts-1.3.92/flow/gsl/Makefile.am.glib 2005-02-03 11:19:06.000000000 +0100
+++ arts-1.3.92/flow/gsl/Makefile.am 2005-02-14 17:45:00.666840346 +0100
@@ -6,18 +6,20 @@
gslincludedir=$(includedir)/arts/gsl
include gslmakefile.inc
+gsl_public_headers += gslglib.h gslartsthreads.h
+
INCLUDES = -I$(top_srcdir)/flow -I$(top_builddir)/flow -I$(top_srcdir)/mcop -I$(top_builddir)/mcop -I$(top_builddir) $(all_includes)
AM_CFLAGS = $(GSL_CFLAGS)
noinst_LTLIBRARIES = libgsl.la
-libgsl_la_SOURCES = $(GSL_C_SRC) gslfilehash.c gslartsthreads.cc
-libgsl_la_LIBADD = $(top_builddir)/mcop/libmcop.la -lm $(LIBPOSIX4) $(GSL_LIBS) $(LIB_POLL) $(GLIB_LIBADD)
-libgsl_la_LDFLAGS = -no-undefined $(all_libraries)
+libgsl_la_SOURCES = $(GSL_C_SRC) gslglib.c gslglibhash.cc gslartsthreads.cc gslfilehash.c
+libgsl_la_LIBADD = $(top_builddir)/mcop/libmcop.la -lm $(LIBPOSIX4) $(GSL_LIBS) $(LIB_POLL)
+libgsl_la_LDFLAGS = -no-undefined
#noinst_PROGRAMS = $(GSL_NOINST_PROGS)
-GSL_progs_ldadd = libgsl.la -lm $(LIBPTHREAD)
+GSL_progs_ldadd = libgsl.la
GSL_cc_dummy = dummy.cc
$(srcdir)/dummy.cc: gslconfig.h
--- arts-1.3.92/flow/gsl/gslengine.c.glib 2003-07-06 00:20:22.000000000 +0200
+++ arts-1.3.92/flow/gsl/gslengine.c 2005-02-14 17:30:12.411093886 +0100
@@ -672,7 +672,7 @@
if (gsl_engine_threaded)
{
- if (!g_thread_supported ()) g_thread_init (NULL);
+ g_thread_init (NULL);
master_thread = gsl_thread_new (_engine_master_thread, NULL);
if (0)
gsl_thread_new (slave, NULL);
--- arts-1.3.92/flow/gsl/gslwchunk.c.glib 2003-10-24 11:06:07.000000000 +0200
+++ arts-1.3.92/flow/gsl/gslwchunk.c 2005-02-14 17:30:12.408094329 +0100
@@ -199,8 +199,7 @@
};
gint i, j, k;
- if (!g_thread_supported ())
- g_thread_init (NULL);
+ g_thread_init (NULL);
gsl_init (gslconfig, NULL);
if (1)
--- arts-1.3.92/flow/gsl/gsltests.c.glib 2005-02-03 11:19:06.000000000 +0100
+++ arts-1.3.92/flow/gsl/gsltests.c 2005-02-14 17:30:12.394096398 +0100
@@ -72,8 +72,7 @@
shift_argc = argc;
shift_argv = (gchar **)argv;
- if (!g_thread_supported ())
- g_thread_init (NULL);
+ g_thread_init (NULL);
gsl_init (NULL, NULL);
arg = shift ();
--- arts-1.3.92/flow/gsl/gslmakefile.inc.glib 2005-02-03 11:19:06.000000000 +0100
+++ arts-1.3.92/flow/gsl/gslmakefile.inc 2005-02-14 17:42:06.202620136 +0100
@@ -5,6 +5,8 @@
#
# this makefile supports:
#
+# GSL_cc_dummy define to an empty .cc file if your linker needs to
+# link GSL object files as c++ code
# GSL_progs_ldadd add link options to this varibale, which are required
# to link GSL_NOINST_PROGS targets
# gslincludedir directory to install public headers into if not empty
@@ -31,30 +33,43 @@
GSL_EXTRA_DAT = gsl.gnuplot gsl-mplan.txt gslarrows gslwave.header gslglib.c gslglib.h gsl-fftgen.pl
EXTRA_DIST += $(GSL_H_SRC) $(GSL_EXTRA_SRC) $(GSL_EXTRA_DAT)
-GSL_NOINST_PROGS = gslwchunk gsltests gslffttest
-gslwchunk_SOURCES = gslwchunk.c
+GSL_NOINST_PROGS = gslwchunk gsltests gslffttest gslglibhashtest
+gslwchunk_SOURCES = gslwchunk.c $(GSL_cc_dummy)
gslwchunk_LDADD = $(GSL_progs_ldadd)
gslwchunk_LDFLAGS = $(USE_THREADS)
-gsltests_SOURCES = gsltests.c
+gsltests_SOURCES = gsltests.c $(GSL_cc_dummy)
gsltests_LDADD = $(GSL_progs_ldadd)
gsltests_LDFLAGS = $(USE_THREADS)
-gslffttest_SOURCES = gslffttest.c
+gslffttest_SOURCES = gslffttest.c $(GSL_cc_dummy)
gslffttest_LDADD = $(GSL_progs_ldadd)
gslffttest_LDFLAGS = $(USE_THREADS)
+gslglibhashtest_SOURCES = gslglibhashtest.cc # C++ already
+gslglibhashtest_LDADD = $(GSL_progs_ldadd)
+gslglibhashtest_LDFLAGS = $(USE_THREADS)
$(srcdir)/gslfft.c: $(srcdir)/gsl-fftgen.pl $(srcdir)/gsl-fftconf.sh
- cd $(srcdir) && ./gsl-fftconf.sh 'perl ./gsl-fftgen.pl' \"gslfft.h\" >gslfft.c
+ cd $(srcdir) && ./gsl-fftconf.sh '$PERL ./gsl-fftgen.pl' \"gslfft.h\" >gslfft.c
MAINTAINERCLEANFILES += gslfft.c
$(srcdir)/gslwchunk.c: gslconfig.h
$(srcdir)/gsltests.c: gslconfig.h
$(srcdir)/gslffttest.c: gslconfig.h
-# $(OBJECTS): gslconfig.h
+$(srcdir)/gslglibhashtest.cc: gslconfig.h
+# $(OBJECTS): gslconfig.
-gsl_public_HEADERS = $(GSL_H_SRC) gslconfig.h
-gsl_publicdir = $(gslincludedir)
+gsl_public_headers = $(GSL_H_SRC) gslconfig.h
-.PHONY: gsltestoutput
+install-data-local: gsl-install-data-local
+gsl-install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(gslincludedir)
+ @list='$(gsl_public_headers)'; \
+ test -z "$(gslincludedir)" || for hfile in $$list ; do \
+ if test -f "$$hfile"; then d= ; else d="$(srcdir)/"; fi; \
+ echo " $(INSTALL_DATA) $$d$$hfile $(DESTDIR)$(gslincludedir)/$$hfile"; \
+ $(INSTALL_DATA) $$d$$hfile $(DESTDIR)$(gslincludedir)/$$hfile; \
+ done
+
+.PHONY: gsltestoutput gsl-install-data-local
gsltestoutput:
@./gsltests blp 7 0.3 0.1211
--- arts-1.3.92/flow/gsl/gslffttest.c.glib 2003-06-15 15:14:54.000000000 +0200
+++ arts-1.3.92/flow/gsl/gslffttest.c 2005-02-14 17:30:12.407094477 +0100
@@ -59,8 +59,7 @@
guint i;
/* initialize GSL */
- if (!g_thread_supported ())
- g_thread_init (NULL);
+ g_thread_init (NULL);
gsl_init (NULL, NULL);
/* initialize random numbers */
--- arts-1.3.92/flow/gslschedule.cc.glib 2004-06-06 21:58:54.000000000 +0200
+++ arts-1.3.92/flow/gslschedule.cc 2005-02-14 17:30:12.418092852 +0100
@@ -847,8 +847,7 @@
};
gsl_is_initialized = true;
- if (!g_thread_supported ())
- g_thread_init(0);
+ g_thread_init(0);
gsl_init(values, (GslMutexTable *)gslGlobalMutexTable);
/*
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-3/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 13 Oct 2004 09:03:10 -0000 1.16
+++ .cvsignore 10 Aug 2005 20:42:21 -0000 1.17
@@ -1,2 +1 @@
-arts-1.3.0.tar.bz2
-arts-1.3.1.tar.bz2
+arts-1.4.2.tar.bz2
Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-3/arts.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- arts.spec 16 Oct 2004 08:26:56 -0000 1.25
+++ arts.spec 10 Aug 2005 20:42:21 -0000 1.26
@@ -4,26 +4,26 @@
%define final 0
%define alsa 1
-%define qt_version 3.3.3
+%define qt_version 3.3.4
-%define libtool 1
+%define make_cvs 1
-Version: 1.3.1
-Release: 2
+Version: 1.4.2
+Release: 0.fc3.2
Summary: aRts (analog realtime synthesizer) - the KDE sound system
Name: arts
Group: System Environment/Daemons
License: LGPL
Epoch: 8
Url: http://www.kde.org
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Patch0: kde-libtool.patch
Patch1: arts-1.1.4-debug.patch
-Patch2: arts-1.2.0-glib2.patch
-Patch3: arts-1.2.2-pie.patch
+Patch2: arts-1.3.92-glib2.patch
Patch4: arts-1.3.0-multilib.patch
+Patch5: arts-1.3.1-alsa.patch
Prereq: /sbin/ldconfig
Requires: audiofile
@@ -89,8 +89,8 @@
%patch0 -p1 -b .libtool
%patch1 -p1 -b .debug
%patch2 -p1 -b .glib
-%patch3 -p1 -b .pie
%patch4 -p1 -b .multilib
+%patch5 -p1 -b .alsa
%build
unset QTDIR && . /etc/profile.d/qt.sh
@@ -99,7 +99,9 @@
export CFLAGS="$FLAGS"
export PATH=`pwd`:$PATH
-make -f admin/Makefile.common cvs
+%if %{make_cvs}
+ make -f admin/Makefile.common cvs
+%endif
%configure \
%if %{alsa}
@@ -156,6 +158,12 @@
%{_bindir}/artsc-config
%changelog
+* Tue Jul 26 2005 Than Ngo <than at redhat.com> 8:1.4.2-0.fc3.2
+- rebuilt
+
+* Tue Jul 26 2005 Than Ngo <than at redhat.com> 8:1.4.2-0.fc3.1
+- update to 1.4.2
+
* Sat Oct 16 2004 Than Ngo <than at redhat.com> 8:1.3.1-2
- rebuilt for rhel
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/arts/FC-3/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 13 Oct 2004 09:03:10 -0000 1.16
+++ sources 10 Aug 2005 20:42:21 -0000 1.17
@@ -1 +1 @@
-26554e4c47d9a52bc20a07e39d32a731 arts-1.3.1.tar.bz2
+bfa5b0efa7454c15976c4e5c618d2db4 arts-1.4.2.tar.bz2
--- arts-1.2.0-glib2.patch DELETED ---
--- arts-1.2.2-pie.patch DELETED ---
More information about the fedora-cvs-commits
mailing list