[packages/libffado] - up to 2.1.0 - removed obsoleted patches - updated files

baggins baggins at pld-linux.org
Tue Jan 28 19:52:45 CET 2014 

commit 9b8367acff938193af00e54ae7021afb9915c7cc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jan 28 19:52:29 2014 +0100

    - up to 2.1.0
    - removed obsoleted patches
    - updated files

 libffado-build.patch | 52 ------------------------------------
 libffado-gcc4.patch  | 64 ---------------------------------------------
 libffado.spec        | 74 ++++++++++++++++++++++++++++------------------------
 3 files changed, 40 insertions(+), 150 deletions(-)
---
diff --git a/libffado.spec b/libffado.spec
index a9c8b4c..7f70d24 100644
--- a/libffado.spec
+++ b/libffado.spec
@@ -6,21 +6,21 @@
 Summary:	Free FireWire audio driver library
 Summary(pl.UTF-8):	Wolnodostępna biblioteka sterownika dźwięku FireWire
 Name:		libffado
-Version:	2.0.0
-Release:	2
+Version:	2.1.0
+Release:	1
 License:	GPL v2 or GPL v3
 Group:		Libraries
 #Source0Download: http://www.ffado.org/?q=node/5
-Source0:	http://www.ffado.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	89fd874731a1437043d0a57ed87c81ef
-Patch0:		%{name}-gcc4.patch
-Patch1:		%{name}-build.patch
-Patch2:		%{name}-api-doc-only.patch
+Source0:	http://www.ffado.org/files/%{name}-%{version}.tgz
+# Source0-md5:	26bce2be0b9c1fa4e614f2f494edf388
+Patch0:		%{name}-api-doc-only.patch
 URL:		http://www.ffado.org/
+BuildRequires:	dbus-c++-devel
 BuildRequires:	dbus-devel >= 1.0
 BuildRequires:	doxygen
 BuildRequires:	expat-devel
 BuildRequires:	jack-audio-connection-kit-devel >= 0.109.12
+BuildRequires:	libconfig-c++-devel
 BuildRequires:	libiec61883-devel >= 1.1.0
 BuildRequires:	libraw1394-devel >= 1.3.0
 BuildRequires:	libstdc++-devel
@@ -93,10 +93,10 @@ Narzędzie diagnostyczne FFADO napisane w Pythonie.
 Summary:	Graphical mixer utility
 Summary(pl.UTF-8):	Graficzny mikser
 Group:		X11/Applications/Sound
-Requires(post,postun):  desktop-file-utils
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name} = %{version}-%{release}
-Requires:       gtk-update-icon-cache
-Requires:       hicolor-icon-theme
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
 Requires:	python-PyQt4 >= 4
 Requires:	python-dbus >= 0.82.0
 
@@ -108,41 +108,35 @@ Graficzny mikser dla FFADO.
 
 %prep
 %setup -q
-%patch0 -p2
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1
 
 %build
-export CFLAGS="%{rpmcflags} -fPIC"
-export CCFLAGS="%{rpmcxxflags} -fPIC"
-export LDFLAGS="%{rpmldflags}"
 %{__scons} \
+	COMPILE_FLAGS="%{rpmcflags}" \
 	PREFIX=%{_prefix} \
+	MANDIR=%{_mandir} \
 	LIBDIR=%{_libdir}
 
-
 %if %{with apidocs}
 %{__scons} doc
-%{__make} -C doc/reference/latex
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir}/hicolor/64x64/apps}
 
-# scons sucks
-export CFLAGS="%{rpmcflags}"
-export CCFLAGS="%{rpmcxxflags}"
-export LDFLAGS="%{rpmldflags}"
-
 %{__scons} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with gui}
-# scons sucks even more
+# scons sucks
 desktop-file-install --dir $RPM_BUILD_ROOT%{_desktopdir} support/xdg/ffado.org-ffadomixer.desktop
 ln -s ../../../../libffado/icons/hi64-apps-ffado.png \
 	$RPM_BUILD_ROOT%{_iconsdir}/hicolor/64x64/apps/ffado.png
+
+%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
+%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
+%py_postclean
 %endif
 
 %clean
@@ -162,18 +156,37 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
+%attr(755,root,root) %{_bindir}/dumpiso_mod
 %attr(755,root,root) %{_bindir}/ffado-bridgeco-downloader
 %attr(755,root,root) %{_bindir}/ffado-dbus-server
+%attr(755,root,root) %{_bindir}/ffado-dice-firmware
 %attr(755,root,root) %{_bindir}/ffado-fireworks-downloader
+%attr(755,root,root) %{_bindir}/ffado-set-nickname
 %attr(755,root,root) %{_bindir}/ffado-test
 %attr(755,root,root) %{_bindir}/ffado-test-isorecv
 %attr(755,root,root) %{_bindir}/ffado-test-isoxmit
 %attr(755,root,root) %{_bindir}/ffado-test-streaming
+%attr(755,root,root) %{_bindir}/ffado-test-streaming-ipc
+%attr(755,root,root) %{_bindir}/ffado-test-streaming-ipcclient
+%attr(755,root,root) %{_bindir}/gen-loadpulses
+%attr(755,root,root) %{_bindir}/scan-devreg
+%attr(755,root,root) %{_bindir}/set-default-router-config-dice-eap
+%attr(755,root,root) %{_bindir}/unmute-ozonic
 %attr(755,root,root) %{_libdir}/libffado.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libffado.so.2
 %dir %{_datadir}/%{name}
+%{_datadir}/libffado/fw410.xml
+%{_datadir}/libffado/fwap.xml
+%{_datadir}/libffado/refdesign.xml
 %{_datadir}/%{name}/configuration
 %dir %{_datadir}/%{name}/python
+%{_mandir}/man1/ffado-bridgeco-downloader.1*
+%{_mandir}/man1/ffado-dbus-server.1*
+%{_mandir}/man1/ffado-diag.1*
+%{_mandir}/man1/ffado-dice-firmware.1*
+%{_mandir}/man1/ffado-fireworks-downloader.1*
+%{_datadir}/dbus-1/services/org.ffado.Control.service
+/lib/udev/rules.d/60-ffado.rules
 
 %files devel
 %defattr(644,root,root,755)
@@ -184,7 +197,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc doc/reference/html doc/reference/latex/*.pdf
+%doc doc/reference/html doc/reference/html/*
 %endif
 
 %files diag
@@ -200,15 +213,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ffado-mixer
 %{_datadir}/%{name}/icons
-%{_datadir}/%{name}/python/ffado_configuration.py
-%{_datadir}/%{name}/python/ffado_dbus_util.py
-%{_datadir}/%{name}/python/ffado_panelmanager.py
-%{_datadir}/%{name}/python/ffado_panelmanagerstatusui.py
-%{_datadir}/%{name}/python/ffado_regdialog.py
-%{_datadir}/%{name}/python/ffado_regdialogui.py
-%{_datadir}/%{name}/python/ffado_registration.py
-%{_datadir}/%{name}/python/ffadomixer_config.py
-%{_datadir}/%{name}/python/mixer_*.py
+%{py_sitescriptdir}/ffado
 %{_desktopdir}/ffado.org-ffadomixer.desktop
 %{_iconsdir}/hicolor/*/apps/ffado.png
+%{_mandir}/man1/ffado-mixer.1*
 %endif
diff --git a/libffado-build.patch b/libffado-build.patch
deleted file mode 100644
index 5b846ef..0000000
--- a/libffado-build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- libffado-2.0.0/SConstruct.orig	2009-12-08 19:08:47.000000000 +0100
-+++ libffado-2.0.0/SConstruct	2011-04-18 14:11:09.449535874 +0200
-@@ -94,12 +94,12 @@
- 	env['LINKFLAGS'] = os.environ['LDFLAGS']
- 
- # grab OS CFLAGS / CCFLAGS
--env['OS_CFLAGS']=[]
-+env['CFLAGS']=[]
- if os.environ.has_key('CFLAGS'):
--	env['OS_CFLAGS'] = os.environ['CFLAGS']
--env['OS_CCFLAGS']=[]
-+	env['CFLAGS'] = os.environ['CFLAGS']
-+env['CCFLAGS']=[]
- if os.environ.has_key('CCFLAGS'):
--	env['OS_CCFLAGS'] = os.environ['CCFLAGS']
-+	env['CCFLAGS'] = os.environ['CCFLAGS']
- 
- Help( """
- For building ffado you can set different options as listed below. You have to
-@@ -291,7 +291,7 @@
- 	print "Doing a DEBUG build"
- 	env.MergeFlags( "-DDEBUG -Wall -g" )
- else:
--	env.MergeFlags( "-O2 -DNDEBUG" )
-+	env.MergeFlags( "-DNDEBUG" )
- 
- if env['PROFILE']:
- 	print "Doing a PROFILE build"
-@@ -359,8 +359,6 @@
- config_os = 3
- config = config_guess.split ("-")
- 
--needs_fPIC = False
--
- # Autodetect
- if env['DIST_TARGET'] == 'auto':
-     if re.search ("x86_64", config[config_cpu]) != None:
-@@ -451,13 +449,11 @@
-     elif env['DIST_TARGET'] == "x86_64":
-         print "Doing a 64-bit x86 build"
-         env.MergeFlags( "-m64" )
--        needs_fPIC = True
-     else:
-         print "Doing a 32-bit build"
- 	env.MergeFlags( "-m32" )
- 
--if needs_fPIC or '-fPIC' in env['OS_CFLAGS'] or "-fPIC" in env['OS_CCFLAGS']:
--    env.MergeFlags( "-fPIC" )
-+env.MergeFlags( "-fPIC" )
- 
- # end of processor-specific section
- if env['ENABLE_OPTIMIZATIONS']:
diff --git a/libffado-gcc4.patch b/libffado-gcc4.patch
deleted file mode 100644
index b890b2f..0000000
--- a/libffado-gcc4.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: branches/libffado-2.0/src/libavc/general/avc_extended_plug_info.cpp
-===================================================================
---- branches/libffado-2.0/src/libavc/general/avc_extended_plug_info.cpp (revision 1235)
-+++ branches/libffado-2.0/src/libavc/general/avc_extended_plug_info.cpp (revision 1825)
-@@ -129,5 +129,5 @@
- }
- 
--ExtendedPlugInfoPlugNameSpecificData::ExtendedPlugInfoPlugNameSpecificData*
-+ExtendedPlugInfoPlugNameSpecificData*
- ExtendedPlugInfoPlugNameSpecificData::clone() const
- {
-@@ -165,5 +165,5 @@
- }
- 
--ExtendedPlugInfoPlugNumberOfChannelsSpecificData::ExtendedPlugInfoPlugNumberOfChannelsSpecificData*
-+ExtendedPlugInfoPlugNumberOfChannelsSpecificData*
- ExtendedPlugInfoPlugNumberOfChannelsSpecificData::clone() const
- {
-@@ -238,5 +238,5 @@
- }
- 
--ExtendedPlugInfoPlugChannelPositionSpecificData::ExtendedPlugInfoPlugChannelPositionSpecificData*
-+ExtendedPlugInfoPlugChannelPositionSpecificData*
- ExtendedPlugInfoPlugChannelPositionSpecificData::clone() const
- {
-@@ -296,5 +296,5 @@
- }
- 
--ExtendedPlugInfoPlugChannelNameSpecificData::ExtendedPlugInfoPlugChannelNameSpecificData*
-+ExtendedPlugInfoPlugChannelNameSpecificData*
- ExtendedPlugInfoPlugChannelNameSpecificData::clone() const
- {
-@@ -343,5 +343,5 @@
- }
- 
--ExtendedPlugInfoPlugInputSpecificData::ExtendedPlugInfoPlugInputSpecificData*
-+ExtendedPlugInfoPlugInputSpecificData*
- ExtendedPlugInfoPlugInputSpecificData::clone() const
- {
-@@ -419,5 +419,5 @@
- }
- 
--ExtendedPlugInfoPlugOutputSpecificData::ExtendedPlugInfoPlugOutputSpecificData*
-+ExtendedPlugInfoPlugOutputSpecificData*
- ExtendedPlugInfoPlugOutputSpecificData::clone() const
- {
-@@ -481,5 +481,5 @@
- }
- 
--ExtendedPlugInfoClusterInfoSpecificData::ExtendedPlugInfoClusterInfoSpecificData*
-+ExtendedPlugInfoClusterInfoSpecificData*
- ExtendedPlugInfoClusterInfoSpecificData::clone() const
- {
-Index: branches/libffado-2.0/support/firmware/bridgeco-downloader.cpp
-===================================================================
---- branches/libffado-2.0/support/firmware/bridgeco-downloader.cpp (revision 1454)
-+++ branches/libffado-2.0/support/firmware/bridgeco-downloader.cpp (revision 1825)
-@@ -180,5 +180,5 @@
-             return -1;
-         }
--        BeBoB::BCD* bcd = new BeBoB::BCD::BCD( args->args[2] );
-+        BeBoB::BCD* bcd = new BeBoB::BCD( args->args[2] );
-         if ( !bcd ) {
-             cerr << "Could no open file " << args->args[2] << endl;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libffado.git/commitdiff/9b8367acff938193af00e54ae7021afb9915c7cc

More information about the pld-cvs-commit mailing list