diff --git a/dvbaudio-fix-build.patch b/dvbaudio-fix-build.patch new file mode 100644 index 0000000..57a84a7 --- /dev/null +++ b/dvbaudio-fix-build.patch @@ -0,0 +1,17 @@ +Subject: Fix build due to uint16_t +From: Lubos Lunak +Patch-upstream: no +Build fails with +/usr/include/linux/dvb/audio.h:79: error: expected '=’, ',’, ';’, 'asm’ or '__attribute__’ before 'audio_attributes_t’ +Since it's a kernel header, it should be rather the kernel uint16_t then the stdint.h one, but they should be the same anyway :). + +--- kaffeine/src/input/dvb/lib/libdvbapi/dvbaudio.c.sav 2008-07-01 15:35:02.000000000 +0200 ++++ kaffeine/src/input/dvb/lib/libdvbapi/dvbaudio.c 2009-04-08 17:47:35.000000000 +0200 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + #include + #include "dvbaudio.h" diff --git a/kaffeine.changes b/kaffeine.changes index 1421d41..6f506f8 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 8 18:06:14 CEST 2009 - llunak@suse.cz + +- fix build due to uint16_t + ------------------------------------------------------------------- Mon Jul 7 12:58:01 CEST 2008 - dmueller@suse.de diff --git a/kaffeine.spec b/kaffeine.spec index 79f60ee..50622e9 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -1,10 +1,17 @@ # # spec file for package kaffeine (Version 0.8.7) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# 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.opensuse.org/ # @@ -23,7 +30,7 @@ License: GPL v2 or later Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player Version: 0.8.7 -Release: 1 +Release: 47 %define rversion %version BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) @@ -45,6 +52,7 @@ Patch6: kaffeine-link.diff Patch8: kaffeine-quote-subs.patch Patch9: pedantic.diff Patch10: kaffeine-tmpobject.diff +Patch11: dvbaudio-fix-build.patch %description Kaffeine plays all files and devices supported by Xine. For example, @@ -87,6 +95,7 @@ Authors: %patch8 %patch9 %patch10 +%patch11 cp %SOURCE5 po/ . /etc/opt/kde3/common_options update_admin @@ -150,6 +159,8 @@ kde_post_install %endif %changelog +* Wed Apr 08 2009 llunak@suse.cz +- fix build due to uint16_t * Mon Jul 07 2008 dmueller@suse.de - update to 0.8.7: * kaffeine: add MOD/STM mimetypes @@ -161,7 +172,7 @@ kde_post_install * DVB: reworked CAM support. * Wed Apr 30 2008 coolo@suse.de - fix build -* Tue Feb 05 2008 schwab@suse.de +* Mon Feb 04 2008 schwab@suse.de - Fix use of temporary object. * Sun Jan 27 2008 stbinner@suse.de - update to 0.8.6: @@ -172,7 +183,7 @@ kde_post_install * several DVB fixes and improvements * CDDA: fixed encoding crash * kaffeine: requires xine-lib =>1.1.9 -* Tue Aug 14 2007 coolo@suse.de +* Mon Aug 13 2007 coolo@suse.de - don't duplicate the docs between -lang and base pack * Fri Aug 10 2007 olh@suse.de - remove private __u64 declaration, asm/types.h was fixed for -ansi @@ -425,7 +436,7 @@ kde_post_install * Mon Aug 25 2003 adrian@suse.de - fix configure script to detect libXtest -> no DPMS anymore during playing -* Sun Aug 24 2003 adrian@suse.de +* Sat Aug 23 2003 adrian@suse.de - drop some delete calls, which are reported as invalid by valgrind seems that fixes the crashes * Mon Jul 28 2003 adrian@suse.de