rpms/libsidplay/devel libsidplay-1.36.57-opts.patch, NONE, 1.1 libsidplay.spec, 1.18, 1.19

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/libsidplay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3644

Modified Files:
	libsidplay.spec 
Added Files:
	libsidplay-1.36.57-opts.patch 
Log Message:
* Sat Oct 20 2007 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-15
- Move the i386-specific configure options into a __i386__ patch.
  This shall fix the multiarch conflict in libsidplay-devel (#342371).


libsidplay-1.36.57-opts.patch:

--- NEW FILE libsidplay-1.36.57-opts.patch ---
diff -Nur libsidplay-1.36.57-orig/src/libcfg.h.in libsidplay-1.36.57/src/libcfg.h.in
--- libsidplay-1.36.57-orig/src/libcfg.h.in	2002-03-08 17:00:47.000000000 +0100
+++ libsidplay-1.36.57/src/libcfg.h.in	2007-10-20 12:04:31.000000000 +0200
@@ -39,11 +39,16 @@
  *
  * This option is highly used and tested. A failing little endian system
  * has not been reported so far.  */
- at DIRECT_FIXPOINT@
+#if defined(__i386__)
+#define DIRECT_FIXPOINT
 
 /* This will cause little(big) endian machines to directly access little(big)
  * endian values in memory structures or arrays, disregarding alignment.  */
+#define OPTIMIZE_ENDIAN_ACCESS
+#else
+ at DIRECT_FIXPOINT@
 @OPTIMIZE_ENDIAN_ACCESS@
+#endif
 	
 /* --------------------------------------------------------------------------
  * Don't touch these!


Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/rpms/libsidplay/devel/libsidplay.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libsidplay.spec	21 Aug 2007 16:55:51 -0000	1.18
+++ libsidplay.spec	21 Oct 2007 09:34:40 -0000	1.19
@@ -1,9 +1,10 @@
 Name: libsidplay
 Summary: Commodore 64 music player and SID chip emulator library
 Version: 1.36.57
-Release: 14
+Release: 15
 Source: http://home.arcor.de/ms2002sep/bak/%{name}-%{version}.tgz
 Patch: libsidplay-post57fixes.patch
+Patch2: libsidplay-1.36.57-opts.patch
 Group: System Environment/Libraries
 URL: http://home.arcor.de/ms2002sep/bak/
 License: GPLv2+
@@ -27,12 +28,10 @@
 %prep
 %setup -q
 %patch -p1 -b .post57fixes
+%patch2 -p1 -b .opts
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS" %configure \
-%ifarch %{ix86}
-  --enable-optfixpoint --enable-optendian \
-%endif
   --disable-static
 make
 
@@ -62,6 +61,10 @@
 %{_includedir}/sidplay
 
 %changelog
+* Sat Oct 20 2007 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-15
+- Move the i386-specific configure options into a __i386__ patch.
+  This shall fix the multiarch conflict in libsidplay-devel (#342371).
+
 * Tue Aug 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt