commit psx-plugins

7 Apr 2006

Hello community,

here is the log from the commit of package psx-plugins
checked in at Fri Apr 7 16:59:26 CEST 2006.

--------

--- psx-plugins/psx-plugins.changes	2006-01-25 21:40:41.000000000 +0100
+++ psx-plugins/psx-plugins.changes	2006-04-06 17:43:29.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr  6 17:38:44 CEST 2006 - schwab@suse.de
+
+- Don't install broken binaries.
+- Always use RPM_OPT_FLAGS.
+- Don't strip binaries.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ psx-plugins.spec ++++++
--- /var/tmp/diff_new_pack.p4FSWk/_old	2006-04-07 16:58:36.000000000 +0200
+++ /var/tmp/diff_new_pack.p4FSWk/_new	2006-04-07 16:58:36.000000000 +0200
@@ -1,11 +1,11 @@
 #
 # spec file for package psx-plugins (Version 20021202)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 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.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
@@ -17,7 +17,7 @@
 #Requires:     xforms
 Autoreqprov:  on
 Version:      20021202
-Release:      318
+Release:        325
 Summary:      Plug-Ins for Sony Playstation Emulators
 Source1:      PeopsSoftGpu107.tar.gz
 Source2:      cdr-1.71.tgz
@@ -144,12 +144,12 @@
 cd ../../spuPeopsSound/Src
 make
 cd linuxcfg
+sed -i -e $'s/\r//' configure.in
 autoreconf --install --force
-./configure || true	# just don't ask...
+./configure CFLAGS="$RPM_OPT_FLAGS"
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %define PLUGINDIR /usr/share/%{name}
 %define DOCDIR %{_docdir}/%{name}
 install -m 755 -d $RPM_BUILD_ROOT%{DOCDIR}
@@ -161,15 +161,15 @@
 install -m 644 gpupeopssoft/*.txt gpupeopssoft/src/*.txt $RPM_BUILD_ROOT%{DOCDIR}/PeopsSoftGpu
 install -m 755 cdr/src/libcdr-*.so $RPM_BUILD_ROOT%{PLUGINDIR}/Plugin
 install -m 644 cdr/ReadMe.txt $RPM_BUILD_ROOT%{DOCDIR}/cdr.ReadMe.txt
-install -m 755 cdr/bin/cfgCdr $RPM_BUILD_ROOT%{PLUGINDIR}/cfg
+install -m 755 cdr/src/cfgCdr $RPM_BUILD_ROOT%{PLUGINDIR}/cfg
 install -m 755 cdriso/src/libcdriso-*.so $RPM_BUILD_ROOT%{PLUGINDIR}/Plugin
 install -m 644 cdriso/ReadMe.txt $RPM_BUILD_ROOT%{DOCDIR}/cdriso.ReadMe.txt
-install -m 755 cdriso/bin/cfgCdrIso $RPM_BUILD_ROOT%{PLUGINDIR}/cfg
+install -m 755 cdriso/src/cfgCdrIso $RPM_BUILD_ROOT%{PLUGINDIR}/cfg
 install -m 755 joystick/libjoypadXwin-*.so $RPM_BUILD_ROOT%{PLUGINDIR}/Plugin
 install -m 644 joystick/ReadMe.txt $RPM_BUILD_ROOT%{DOCDIR}/joypadXwin.ReadMe.txt
 install -m 755 padXwin/src/libpadXwin-*.so $RPM_BUILD_ROOT%{PLUGINDIR}/Plugin
 install -m 644 padXwin/ReadMe.txt $RPM_BUILD_ROOT%{DOCDIR}/padXwin.ReadMe.txt
-install -m 755 padXwin/bin/cfgPadXwin $RPM_BUILD_ROOT%{PLUGINDIR}/cfg
+install -m 755 padXwin/src/cfgPadXwin $RPM_BUILD_ROOT%{PLUGINDIR}/cfg
 install -m 755 spu/src/libspu-*.so $RPM_BUILD_ROOT%{PLUGINDIR}/Plugin
 install -m 644 spu/ReadMe.txt $RPM_BUILD_ROOT%{DOCDIR}/spu.ReadMe.txt
 install -m 755 spunull/src/libspunull-*.so $RPM_BUILD_ROOT%{PLUGINDIR}/Plugin
@@ -184,7 +184,7 @@
 %endif
 cd spuPeopsSound
 install -m 755 Src/linuxcfg/src/spucfg $RPM_BUILD_ROOT%{PLUGINDIR}/cfg/cfgPeopsOSS
-install -m 755 libspuPeopsOSS.so.* $RPM_BUILD_ROOT%{PLUGINDIR}/Plugin
+install -m 755 Src/libspuPeopsOSS.so.* $RPM_BUILD_ROOT%{PLUGINDIR}/Plugin
 install -d -m 755 $RPM_BUILD_ROOT%{DOCDIR}/spuPeopsOSS
 install -m 644 readme_1_1.txt $RPM_BUILD_ROOT%{DOCDIR}/spuPeopsOSS
 install -m 644 version_1_1.txt $RPM_BUILD_ROOT%{DOCDIR}/spuPeopsOSS
@@ -202,6 +202,10 @@
 %{DOCDIR}
 
 %changelog -n psx-plugins
+* Thu Apr 06 2006 - schwab@suse.de
+- Don't install broken binaries.
+- Always use RPM_OPT_FLAGS.
+- Don't strip binaries.
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Mon Sep 26 2005 - uli@suse.de


++++++ cdr.dif ++++++
--- /var/tmp/diff_new_pack.p4FSWk/_old	2006-04-07 16:58:37.000000000 +0200
+++ /var/tmp/diff_new_pack.p4FSWk/_new	2006-04-07 16:58:37.000000000 +0200
@@ -9,6 +9,19 @@
  OBJECTS = cdr.o
  CFGOBJS = conf.o interface.o support.o
  LIBS = -lpthread
+@@ -17,12 +17,10 @@
+ plugin: ${OBJECTS}
+ 	rm -f ${PLUGIN}
+ 	${CC} -shared -Wl,-soname,${PLUGIN} ${CFLAGS} ${OBJECTS} -o ${PLUGIN} ${LIBS}
+-	strip --strip-unneeded --strip-debug ${PLUGIN}
+ 
+ cfg: ${CFGOBJS}
+ 	rm -f ${CFG}
+ 	${CC} ${CFLAGS} ${CFGOBJS} -o ${CFG} ${CFGLIBS}
+-	strip ${CFG}
+ 
+ clean: 
+ 	rm -f *.o *.so ${CFG}
 --- src/cdr.c
 +++ src/cdr.c
 @@ -15,6 +15,7 @@

++++++ cdriso.dif ++++++
--- /var/tmp/diff_new_pack.p4FSWk/_old	2006-04-07 16:58:37.000000000 +0200
+++ /var/tmp/diff_new_pack.p4FSWk/_new	2006-04-07 16:58:37.000000000 +0200
@@ -9,3 +9,16 @@
  OBJECTS = cdriso.o
  CFGOBJS = conf.o interface.o support.o
  LIBS = -lz -lbz2
+@@ -18,12 +18,10 @@
+ plugin: ${OBJECTS}
+ 	rm -f ${PLUGIN}
+ 	${CC} -shared -Wl,-soname,${PLUGIN} ${CFLAGS} ${OBJECTS} -o ${PLUGIN} ${LIBS}
+-	strip --strip-unneeded --strip-debug ${PLUGIN}
+ 
+ cfg: ${CFGOBJS}
+ 	rm -f ${CFG}
+ 	${CC} ${CFLAGS} ${CFGOBJS} -o ${CFG} ${CFGLIBS}
+-	strip ${CFG}
+ 
+ clean: 
+ 	rm -f *.o *.so ${CFG}

++++++ joystick.dif ++++++
--- /var/tmp/diff_new_pack.p4FSWk/_old	2006-04-07 16:58:38.000000000 +0200
+++ /var/tmp/diff_new_pack.p4FSWk/_new	2006-04-07 16:58:38.000000000 +0200
@@ -9,6 +9,14 @@
  OBJECTS = pad.o
  LIBS = $(shell gtk-config --libs)
  CFLAGS += $(shell gtk-config --cflags) -DVERSION=${VERSION} -DBUILD=${BUILD}
+@@ -12,7 +12,6 @@
+ plugin: ${OBJECTS}
+ 	rm -f ${PLUGIN}
+ 	gcc -shared -Wl,-soname,${PLUGIN} ${CFLAGS} ${OBJECTS} -o ${PLUGIN} ${LIBS}
+-	strip --strip-unneeded --strip-debug ${PLUGIN}
+ 
+ clean: 
+ 	rm -f *.o *.so
 --- pad.c
 +++ pad.c
 @@ -101,8 +101,8 @@

++++++ padJoy.dif ++++++
--- /var/tmp/diff_new_pack.p4FSWk/_old	2006-04-07 16:58:38.000000000 +0200
+++ /var/tmp/diff_new_pack.p4FSWk/_new	2006-04-07 16:58:38.000000000 +0200
@@ -9,3 +9,11 @@
  OBJECTS = pad.o
  LIBS = $(shell gtk-config --libs) -lpthread
  CFLAGS += $(shell gtk-config --cflags) -DVERSION=${VERSION} -DBUILD=${BUILD}
+@@ -12,7 +12,6 @@
+ plugin: ${OBJECTS}
+ 	rm -f ${PLUGIN}
+ 	gcc -shared -Wl,-soname,${PLUGIN} ${CFLAGS} ${OBJECTS} -o ${PLUGIN} ${LIBS}
+-	strip --strip-unneeded --strip-debug ${PLUGIN}
+ 
+ clean: 
+ 	rm -f *.o *.so

++++++ padXwin.dif ++++++
--- /var/tmp/diff_new_pack.p4FSWk/_old	2006-04-07 16:58:38.000000000 +0200
+++ /var/tmp/diff_new_pack.p4FSWk/_new	2006-04-07 16:58:38.000000000 +0200
@@ -13,3 +13,16 @@
  CFGLIBS = $(shell gtk-config --libs) 
  CFLAGS += $(shell gtk-config --cflags) -DVERSION=${VERSION} -DBUILD=${BUILD}
  
+@@ -15,12 +15,10 @@
+ plugin: ${OBJECTS}
+ 	rm -f ${PLUGIN}
+ 	gcc -shared -Wl,-soname,${PLUGIN} ${CFLAGS} ${OBJECTS} -o ${PLUGIN} ${LIBS}
+-	strip --strip-unneeded --strip-debug ${PLUGIN}
+ 
+ cfg: ${CFGOBJS}
+ 	rm -f ${CFG}
+ 	${CC} ${CFLAGS} ${CFGOBJS} -o ${CFG} ${CFGLIBS}
+-	strip ${CFG}
+ 
+ clean: 
+ 	rm -f *.o *.so ${CFG}

++++++ spu.dif ++++++
--- /var/tmp/diff_new_pack.p4FSWk/_old	2006-04-07 16:58:38.000000000 +0200
+++ /var/tmp/diff_new_pack.p4FSWk/_new	2006-04-07 16:58:38.000000000 +0200
@@ -9,3 +9,11 @@
  OBJECTS = spu.o vagdepack.o
  LIBS = -lpthread $(shell gtk-config --libs) 
  CFLAGS+= $(shell gtk-config --cflags)
+@@ -11,7 +11,6 @@
+ plugin: ${OBJECTS}
+ 	rm -f ${PLUGIN}
+ 	gcc -shared -Wl,-soname,${PLUGIN} ${CFLAGS} ${OBJECTS} -o ${PLUGIN} ${LIBS}
+-	strip --strip-unneeded --strip-debug ${PLUGIN}
+ 
+ clean: 
+ 	rm -f *.o *.so

++++++ spuPeopsSound.dif ++++++
--- /var/tmp/diff_new_pack.p4FSWk/_old	2006-04-07 16:58:38.000000000 +0200
+++ /var/tmp/diff_new_pack.p4FSWk/_new	2006-04-07 16:58:38.000000000 +0200
@@ -1,6 +1,6 @@
 --- Src/Makefile
 +++ Src/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,12 +9,12 @@
  CC = gcc
  CCFLAGS1 = -fPIC -c -Wall -m486 -O3
  CCFLAGS2 = -fPIC -c -Wall -m486 -O2 -ffast-math
@@ -9,3 +9,9 @@
  INCLUDE =
  LINK = gcc
  LINKFLAGS = -shared -Wl,-soname,libspuPeopsOSS.so -o libspuPeopsOSS.so.1.0.1
+ OBJ =   spu.o cfg.o dma.o freeze.o oss.o psemu.o registers.o
+-LIB = -lc -lpthread -lm -L/usr/X11R6/lib -L/usr/lib
++LIB = -lpthread -lm -L/usr/X11R6/lib -L/usr/lib
+ 
+ ############################################################################## 
+ # 2. MAIN RULE 

++++++ spunull.dif ++++++
--- /var/tmp/diff_new_pack.p4FSWk/_old	2006-04-07 16:58:38.000000000 +0200
+++ /var/tmp/diff_new_pack.p4FSWk/_new	2006-04-07 16:58:38.000000000 +0200
@@ -9,3 +9,11 @@
  OBJECTS = spu.o
  
  all: plugin
+@@ -9,7 +9,6 @@
+ plugin: ${OBJECTS}
+ 	rm -f ${PLUGIN}
+ 	gcc -shared -Wl,-soname,${PLUGIN} ${CFLAGS} ${OBJECTS} -o ${PLUGIN} ${LIBS}
+-	strip --strip-unneeded --strip-debug ${PLUGIN}
+ 
+ clean: 
+ 	rm -f *.o *.so


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

commit psx-plugins

root＠suse.de