rpms/hydrogen/devel hydrogen-internal-tinyxml.patch, NONE, 1.1 hydrogen-snapshot.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 hydrogen.spec, 1.6, 1.7 sources, 1.2, 1.3 hydrogen-0.9.3-flac113.patch, 1.1, NONE hydrogen-0.9.3-g++4.patch, 1.1, NONE hydrogen-0.9.3-gcc43.patch, 1.2, NONE hydrogen-0.9.3-libdir.patch, 1.1, NONE hydrogen-0.9.3-null-sample.patch, 1.1, NONE hydrogen-0.9.3-wasp.patch, 1.1, NONE
Orcan Ogetbil
oget at fedoraproject.org
Fri Feb 13 21:06:38 UTC 2009
- Previous message (by thread): rpms/Macaulay2/devel Macaulay2-1.1-optflags.patch,1.1,NONE
- Next message (by thread): rpms/factory/devel factory-3.1.0-new.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 factory.spec, 1.27, 1.28 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: oget
Update of /cvs/pkgs/rpms/hydrogen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11737
Modified Files:
.cvsignore hydrogen.spec sources
Added Files:
hydrogen-internal-tinyxml.patch hydrogen-snapshot.sh
Removed Files:
hydrogen-0.9.3-flac113.patch hydrogen-0.9.3-g++4.patch
hydrogen-0.9.3-gcc43.patch hydrogen-0.9.3-libdir.patch
hydrogen-0.9.3-null-sample.patch hydrogen-0.9.3-wasp.patch
Log Message:
* Fri Feb 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.1.790svn
- Update to 0.9.4-beta3 (uses scons and qt4)
hydrogen-internal-tinyxml.patch:
--- NEW FILE hydrogen-internal-tinyxml.patch ---
diff -rupN hydrogen.old/hydrogen.kdevelop hydrogen/hydrogen.kdevelop
--- hydrogen.old/hydrogen.kdevelop 2009-02-13 14:22:04.000000000 -0500
+++ hydrogen/hydrogen.kdevelop 2009-02-13 14:43:03.000000000 -0500
@@ -180,13 +180,6 @@
<path>gui/src/widgets/moc_MidiActivityWidget.cc</path>
<path>gui/src/widgets/moc_midiTable.cc</path>
<path>gui/src/widgets/moc_Rotary.cc</path>
- <path>libs/hydrogen/src/xml</path>
- <path>libs/hydrogen/src/xml/tinystr.cpp</path>
- <path>libs/hydrogen/src/xml/tinystr.h</path>
- <path>libs/hydrogen/src/xml/tinyxml.cpp</path>
- <path>libs/hydrogen/src/xml/tinyxmlerror.cpp</path>
- <path>libs/hydrogen/src/xml/tinyxml.h</path>
- <path>libs/hydrogen/src/xml/tinyxmlparser.cpp</path>
<path>plugins</path>
<path>plugins/wasp</path>
<path>plugins/wasp/include</path>
diff -rupN hydrogen.old/libs/hydrogen/hydrogen.pro hydrogen/libs/hydrogen/hydrogen.pro
--- hydrogen.old/libs/hydrogen/hydrogen.pro 2009-02-13 14:22:01.000000000 -0500
+++ hydrogen/libs/hydrogen/hydrogen.pro 2009-02-13 14:43:03.000000000 -0500
@@ -82,9 +82,6 @@ HEADERS += \
include/hydrogen/smf/SMFEvent.h \
\
\
- src/xml/tinystr.h \
- src/xml/tinyxml.h \
- \
src/IO/AlsaMidiDriver.h \
src/IO/DiskWriterDriver.h \
src/IO/FakeDriver.h \
@@ -99,11 +96,6 @@ HEADERS += \
SOURCES += \
- src/xml/tinystr.cpp \
- src/xml/tinyxml.cpp \
- src/xml/tinyxmlerror.cpp \
- src/xml/tinyxmlparser.cpp \
- \
src/IO/alsa_midi_driver.cpp \
src/IO/disk_writer_driver.cpp \
src/IO/fake_driver.cpp \
diff -rupN hydrogen.old/libs/hydrogen/src/local_file_mgr.cpp hydrogen/libs/hydrogen/src/local_file_mgr.cpp
--- hydrogen.old/libs/hydrogen/src/local_file_mgr.cpp 2009-02-13 14:22:01.000000000 -0500
+++ hydrogen/libs/hydrogen/src/local_file_mgr.cpp 2009-02-13 14:44:51.000000000 -0500
@@ -47,7 +47,7 @@
#include <QApplication>
#include <QVector>
-#include "xml/tinyxml.h"
+#include <tinyxml.h>
#include <algorithm>
//#include <cstdio>
diff -rupN hydrogen.old/libs/hydrogen/src/preferences.cpp hydrogen/libs/hydrogen/src/preferences.cpp
--- hydrogen.old/libs/hydrogen/src/preferences.cpp 2009-02-13 14:22:01.000000000 -0500
+++ hydrogen/libs/hydrogen/src/preferences.cpp 2009-02-13 14:43:03.000000000 -0500
@@ -42,7 +42,7 @@
#include "config.h"
#include "version.h"
-#include "xml/tinyxml.h"
+#include <tinyxml.h>
#include <QDir>
#include <QApplication>
diff -rupN hydrogen.old/libs/hydrogen/src/song.cpp hydrogen/libs/hydrogen/src/song.cpp
--- hydrogen.old/libs/hydrogen/src/song.cpp 2009-02-13 14:22:01.000000000 -0500
+++ hydrogen/libs/hydrogen/src/song.cpp 2009-02-13 14:43:03.000000000 -0500
@@ -25,7 +25,7 @@
#include <cassert>
-#include "xml/tinyxml.h"
+#include <tinyxml.h>
#include <hydrogen/adsr.h>
#include <hydrogen/data_path.h>
diff -rupN hydrogen.old/Sconstruct hydrogen/Sconstruct
--- hydrogen.old/Sconstruct 2009-02-13 14:22:05.000000000 -0500
+++ hydrogen/Sconstruct 2009-02-13 14:43:03.000000000 -0500
@@ -72,7 +72,7 @@ def get_platform_flags( opts ):
if sys.platform == "darwin" and str(env['coreaudio']) == "1": cppflags.append('-DCOREAUDIO_SUPPORT')
cppflags.append('-DLADSPA_SUPPORT')
-
+ ldflags.append('-ltinyxml')
if str(env['libarchive']) == "1": cppflags.append('-DLIBARCHIVE_SUPPORT')
@@ -237,6 +237,7 @@ def get_hydrogen_gui( lib_hydrogen , opt
env.Append( LIBS = lib_hydrogen )
env.Append( LIBS = ["sndfile"] )
+ env.Append( LIBS = ["tinyxml"] )
if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] )
if str(env['flac']) == "1": env.Append( LIBS = ["FLAC","FLAC++"] )
@@ -366,6 +367,11 @@ if platform == "darwin" or platform == "
#Check if all required libraries are installed
conf = Configure(env)
+
+if not conf.CheckCXXHeader('tinyxml.h'):
+ print 'tinyxml must be installed!'
+ Exit(1)
+
if not conf.CheckCHeader('sndfile.h'):
print 'libsndfile must be installed!'
Exit(1)
--- NEW FILE hydrogen-snapshot.sh ---
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y%m%d)svn
name=hydrogen
version=0.9.4-beta3
cd "$tmp"
svn co http://svn.assembla.com/svn/hydrogen/tags/$version $name
revision=$(svnversion $name)
# We remove the .svn directories from the tarball to save space and we
# actually don't need them, except this one place where scons calls
# /usr/bin/svnversion to look up the version of these directories.
# We hack the build script so that it doesn't call /usr/bin/svnversion .
# This saves us a BR and ~2MB otherwise unneeded diskspace:
find ./$name -type d -name .svn -print0 | xargs -0r rm -rf
sed -i "s|\(revision():\)|\1\n\treturn \"$revision\"|" $name/Sconstruct
tar jcf "$pwd"/$name-$version-"$revision"svn.tar.bz2 $name
echo "Wrote: " $name-$version-"$revision"svn.tar.bz2
cd - >/dev/null
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 9 Oct 2007 06:00:17 -0000 1.2
+++ .cvsignore 13 Feb 2009 21:06:07 -0000 1.3
@@ -1 +1 @@
-hydrogen-0.9.3.tar.gz
+hydrogen-0.9.4-beta3-790svn.tar.bz2
Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/hydrogen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hydrogen.spec 4 Apr 2008 17:04:48 -0000 1.6
+++ hydrogen.spec 13 Feb 2009 21:06:07 -0000 1.7
@@ -1,58 +1,58 @@
+%define svn 790
+
Summary: Advanced drum machine for GNU/Linux
Name: hydrogen
-Version: 0.9.3
-Release: 13%{?dist}
+Version: 0.9.4
+Release: 0.1.%{svn}svn%{?dist}
URL: http://www.hydrogen-music.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0: hydrogen-0.9.3-g++4.patch
-Patch1: hydrogen-0.9.3-flac113.patch
-Patch3: hydrogen-0.9.3-wasp.patch
-Patch4: hydrogen-0.9.3-libdir.patch
-Patch5: hydrogen-0.9.3-null-sample.patch
-Patch6: hydrogen-0.9.3-gcc43.patch
+Source0: %{name}-%{version}-beta3-%{svn}svn.tar.bz2
+# For convenience, to take the svn snapshot:
+Source9: hydrogen-snapshot.sh
+# Use internal tinyxml instead of the one supplied by hydrogen:
+# Sent upstream:
+# https://sourceforge.net/mailarchive/message.php?msg_name=e76492710901221851m3a285da8n9422642afe443124%40mail.gmail.com
+Patch0: hydrogen-internal-tinyxml.patch
License: GPLv2+
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: flac-devel jack-audio-connection-kit-devel liblrdf-devel
-BuildRequires: qt3-devel libsndfile-devel alsa-lib-devel
-BuildRequires: libxml2-devel desktop-file-utils
+BuildRequires: qt4-devel libsndfile-devel alsa-lib-devel portaudio-devel
+BuildRequires: desktop-file-utils lash-devel libtar-devel scons tinyxml-devel
+BuildRequires: portmidi-devel
%description
-Hydrogen is an advanced drum machine for GNU/Linux. It's main goal is
-to bring professional yet simple and intuitive pattern-based drum
-programming.
+Hydrogen is an advanced drum machine for GNU/Linux. It's main goal is to bring
+professional yet simple and intuitive pattern-based drum programming.
%prep
-%setup -q
-%patch0 -p0 -b .g++4
-%patch1 -p0 -b .flac133
-%patch3 -p1 -b .wasp
-%patch4 -p1 -b .libdir
-%patch5 -p0 -b .null-sample
-%patch6 -p1 -b .gcc43
+%setup -q -n %{name}
+patch -p0 < patches/portaudio.patch
+patch -p0 < patches/portmidi.patch
+%patch0 -p1 -b .tinyxml
%build
-%configure --disable-oss-support
-# Not using _smp_mflags macro: Dependencies are not tracked correctly in
-# Makefiles, concurrency problems would occur
-make
+scons prefix=%{_prefix} portaudio=1 portmidi=1 lash=1 oss=0 optflags="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+scons install DESTDIR=$RPM_BUILD_ROOT
+
# Reinstall hydrogen.desktop properly.
rm $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --remove-category Application \
- --remove-category Sound \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Drumming \
--add-category X-MIDI \
--add-category X-Jack \
--remove-mime-type text/xml \
hydrogen.desktop
+# Move the icon to the proper place
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -69,14 +69,20 @@
fi
%files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING README
-%{_bindir}/hydrogen*
-%{_libdir}/hydrogen
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README.txt
+# FIXME: The software still shows the old documentation internally.
+# Remove these when this is fixed upstream:
+%doc data/new_manual/* data/new_tutorial/*
+%{_bindir}/hydrogen
%{_datadir}/hydrogen
%{_datadir}/applications/fedora-hydrogen.desktop
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
%changelog
+* Fri Feb 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.1.790svn
+- Update to 0.9.4-beta3 (uses scons and qt4)
+
* Fri Apr 04 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.9.3-13
- QT3 changes by rdieter
- Fix build
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Oct 2007 06:00:17 -0000 1.2
+++ sources 13 Feb 2009 21:06:07 -0000 1.3
@@ -1 +1 @@
-d5840b5d330d433d00ea1727efb0fc7f hydrogen-0.9.3.tar.gz
+125369a770cd183a3250084146e739b5 hydrogen-0.9.4-beta3-790svn.tar.bz2
--- hydrogen-0.9.3-flac113.patch DELETED ---
--- hydrogen-0.9.3-g++4.patch DELETED ---
--- hydrogen-0.9.3-gcc43.patch DELETED ---
--- hydrogen-0.9.3-libdir.patch DELETED ---
--- hydrogen-0.9.3-null-sample.patch DELETED ---
--- hydrogen-0.9.3-wasp.patch DELETED ---
- Previous message (by thread): rpms/Macaulay2/devel Macaulay2-1.1-optflags.patch,1.1,NONE
- Next message (by thread): rpms/factory/devel factory-3.1.0-new.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 factory.spec, 1.27, 1.28 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list