rpms/minitube/F-12 .cvsignore, 1.2, 1.3 minitube.spec, 1.1, 1.2 sources, 1.2, 1.3
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv849
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Sun Oct 13 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-1
- version 1.2
- QString patch dropped
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Aug 2010 14:31:59 -0000 1.2
+++ .cvsignore 13 Oct 2010 18:16:03 -0000 1.3
@@ -1 +1 @@
-minitube-1.1.tar.gz
+minitube-1.2.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-12/minitube.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- minitube.spec 18 Aug 2010 14:31:59 -0000 1.1
+++ minitube.spec 13 Oct 2010 18:16:03 -0000 1.2
@@ -1,6 +1,6 @@
Name: minitube
-Version: 1.1
-Release: 7%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -36,8 +36,9 @@
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
+
# fix breakage caused by qtsingleapplication-add-api.patch
-#Patch1: minitube-QString.patch
+# Patch1: minitube-QString.patch
# name the lang files
Patch2: minitube-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +72,7 @@
# rename latvian language code
mv locale/lat.ts locale/lv.ts
+
%patch0 -p 1
#%%patch1 -p 0
@@ -126,6 +128,13 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Sun Oct 13 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-1
+- version 1.2
+- QString patch dropped
+
+* Sat Aug 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.1-8
+- rebuilt
+
* Sun Aug 15 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.1-7
- drop minitube-QString.patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Aug 2010 14:31:59 -0000 1.2
+++ sources 13 Oct 2010 18:16:03 -0000 1.3
@@ -1 +1 @@
-075841322631486a8bb69575ec05f5ca minitube-1.1.tar.gz
+c0e2bae37ce84fac505950ed1b2b1f36 minitube-1.2.tar.gz
13 years, 6 months
rpms/minitube/F-13 .cvsignore, 1.2, 1.3 minitube.spec, 1.1, 1.2 sources, 1.2, 1.3
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv654
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Sun Oct 13 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-1
- version 1.2
- QString patch dropped
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Aug 2010 14:31:17 -0000 1.2
+++ .cvsignore 13 Oct 2010 18:14:32 -0000 1.3
@@ -1 +1 @@
-minitube-1.1.tar.gz
+minitube-1.2.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/minitube.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- minitube.spec 18 Aug 2010 14:31:17 -0000 1.1
+++ minitube.spec 13 Oct 2010 18:14:32 -0000 1.2
@@ -1,6 +1,6 @@
Name: minitube
-Version: 1.1
-Release: 7%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -36,8 +36,9 @@
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
+
# fix breakage caused by qtsingleapplication-add-api.patch
-#Patch1: minitube-QString.patch
+# Patch1: minitube-QString.patch
# name the lang files
Patch2: minitube-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +72,7 @@
# rename latvian language code
mv locale/lat.ts locale/lv.ts
+
%patch0 -p 1
#%%patch1 -p 0
@@ -126,6 +128,13 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Sun Oct 13 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-1
+- version 1.2
+- QString patch dropped
+
+* Sat Aug 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.1-8
+- rebuilt
+
* Sun Aug 15 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.1-7
- drop minitube-QString.patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Aug 2010 14:31:17 -0000 1.2
+++ sources 13 Oct 2010 18:14:32 -0000 1.3
@@ -1 +1 @@
-075841322631486a8bb69575ec05f5ca minitube-1.1.tar.gz
+c0e2bae37ce84fac505950ed1b2b1f36 minitube-1.2.tar.gz
13 years, 6 months
rpms/minitube/devel .cvsignore, 1.2, 1.3 minitube.spec, 1.2, 1.3 sources, 1.2, 1.3
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv504
Modified Files:
.cvsignore minitube.spec sources
Log Message:
* Sun Oct 13 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-1
- version 1.2
- QString patch dropped
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Aug 2010 14:08:47 -0000 1.2
+++ .cvsignore 13 Oct 2010 18:12:43 -0000 1.3
@@ -1 +1 @@
-minitube-1.1.tar.gz
+minitube-1.2.tar.gz
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/minitube.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- minitube.spec 21 Aug 2010 11:44:03 -0000 1.2
+++ minitube.spec 13 Oct 2010 18:12:43 -0000 1.3
@@ -1,6 +1,6 @@
Name: minitube
-Version: 1.1
-Release: 8%{?dist}
+Version: 1.2
+Release: 1%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -36,8 +36,9 @@
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
+
# fix breakage caused by qtsingleapplication-add-api.patch
-#Patch1: minitube-QString.patch
+# Patch1: minitube-QString.patch
# name the lang files
Patch2: minitube-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +72,7 @@
# rename latvian language code
mv locale/lat.ts locale/lv.ts
+
%patch0 -p 1
#%%patch1 -p 0
@@ -126,6 +128,10 @@
%dir %{_datadir}/%{name}/locale
%changelog
+* Sun Oct 13 2010 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.2-1
+- version 1.2
+- QString patch dropped
+
* Sat Aug 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.1-8
- rebuilt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Aug 2010 14:08:47 -0000 1.2
+++ sources 13 Oct 2010 18:12:43 -0000 1.3
@@ -1 +1 @@
-075841322631486a8bb69575ec05f5ca minitube-1.1.tar.gz
+c0e2bae37ce84fac505950ed1b2b1f36 minitube-1.2.tar.gz
13 years, 6 months
rpms/k3b-extras-freeworld/F-13 .cvsignore, 1.10, 1.11 k3b-extras-freeworld.spec, 1.19, 1.20 sources, 1.11, 1.12
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30874
Modified Files:
.cvsignore k3b-extras-freeworld.spec sources
Log Message:
* Mon Sep 13 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.1-1
- k3b-2.0.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-13/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 12 Jul 2010 13:26:28 -0000 1.10
+++ .cvsignore 13 Oct 2010 17:45:52 -0000 1.11
@@ -1 +1 @@
-k3b-2.0.0.tar.bz2
+k3b-2.0.1.tar.bz2
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-13/k3b-extras-freeworld.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- k3b-extras-freeworld.spec 10 Jul 2010 16:46:26 -0000 1.19
+++ k3b-extras-freeworld.spec 13 Oct 2010 17:45:52 -0000 1.20
@@ -2,7 +2,7 @@
Name: k3b-extras-freeworld
Summary: Additional codec plugins for the k3b CD/DVD burning application
Epoch: 1
-Version: 2.0.0
+Version: 2.0.1
Release: 1%{?dist}
Group: Applications/Archiving
@@ -48,7 +48,9 @@
%prep
%setup -q -n k3b-%{version}
-%patch1 -p1 -b .ffmpeg06
+## seems no longer needed with ffmpeg-0.6+k3b-2.0.1 at least,
+## keep it around temporarily just in case -- Rex
+#patch1 -p1 -b .ffmpeg06
%build
@@ -92,6 +94,9 @@
%changelog
+* Mon Sep 13 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.1-1
+- k3b-2.0.1
+
* Sat Jul 10 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.0-1
- k3b-2.0.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-13/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 12 Jul 2010 13:26:28 -0000 1.11
+++ sources 13 Oct 2010 17:45:52 -0000 1.12
@@ -1 +1 @@
-2ec161ccd6c24778d4c5289c85473747 k3b-2.0.0.tar.bz2
+4e5b6665d91d4984cbfa814b797257cb k3b-2.0.1.tar.bz2
13 years, 6 months
rpms/k3b-extras-freeworld/devel k3b-extras-freeworld.spec, 1.21, 1.22
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30739
Modified Files:
k3b-extras-freeworld.spec
Log Message:
* Wed Oct 13 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.1-2
- rebuild (gcc)
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- k3b-extras-freeworld.spec 13 Sep 2010 13:52:17 -0000 1.21
+++ k3b-extras-freeworld.spec 13 Oct 2010 17:44:28 -0000 1.22
@@ -3,7 +3,7 @@
Summary: Additional codec plugins for the k3b CD/DVD burning application
Epoch: 1
Version: 2.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Archiving
License: GPLv2+
@@ -94,6 +94,9 @@
%changelog
+* Wed Oct 13 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.1-2
+- rebuild (gcc)
+
* Mon Sep 13 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.1-1
- k3b-2.0.1
13 years, 6 months
rpms/mixxx/devel mixxx.spec,1.6,1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mixxx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22931
Modified Files:
mixxx.spec
Log Message:
Update BR splitted in F14
Index: mixxx.spec
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/mixxx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mixxx.spec 13 Oct 2010 15:16:20 -0000 1.6
+++ mixxx.spec 13 Oct 2010 15:44:14 -0000 1.7
@@ -17,6 +17,7 @@
BuildRequires: alsa-lib-devel >= 1.0.10
#BuildRequires: jack-audio-connection-kit-devel >= 0.61.0 #jack seems deprecated to portaudio
BuildRequires: qt4-devel >= 4.3
+BuildRequires: qt4-webkit-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libid3tag-devel
13 years, 6 months
rpms/amule/devel amule.spec,1.11,1.12
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/amule/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21224
Modified Files:
amule.spec
Log Message:
rebuilt
Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/devel/amule.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amule.spec 24 Sep 2010 12:42:06 -0000 1.11
+++ amule.spec 13 Oct 2010 15:19:06 -0000 1.12
@@ -2,7 +2,7 @@
Name: amule
Version: 2.2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Group: Applications/Internet
@@ -165,6 +165,9 @@
%changelog
+* Wed Oct 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-3
+- rebuilt
+
* Fri Sep 24 2010 Felix Kaechele <heffer(a)fedoraproject.org> - 2.2.6-2
- rebuild for new wx
13 years, 6 months
rpms/mixxx/devel sources, 1.4, 1.5 .cvsignore, 1.4, 1.5 mixxx.spec, 1.5, 1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mixxx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20826
Modified Files:
sources .cvsignore mixxx.spec
Log Message:
Update to 1.8.0.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 6 Sep 2010 20:41:51 -0000 1.4
+++ sources 13 Oct 2010 15:16:20 -0000 1.5
@@ -1 +1 @@
-a2121eb10f2521a44acd2d17ba6b481d mixxx-1.7.2-src.tar.gz
+5e896fbd77c1d44f1916e7ad4740c1ac mixxx-1.8.0.2-src.tar.gz
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 6 Sep 2010 20:41:51 -0000 1.4
+++ .cvsignore 13 Oct 2010 15:16:20 -0000 1.5
@@ -1 +1 @@
-mixxx-1.7.2-src.tar.gz
+mixxx-1.8.0.2-src.tar.gz
Index: mixxx.spec
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/mixxx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mixxx.spec 6 Sep 2010 20:41:51 -0000 1.5
+++ mixxx.spec 13 Oct 2010 15:16:20 -0000 1.6
@@ -1,5 +1,5 @@
Name: mixxx
-Version: 1.7.2
+Version: 1.8.0.2
Release: 1%{?dist}
Summary: Mixxx is open source software for DJ'ing
@@ -16,7 +16,7 @@
#Mandatory Requirements
BuildRequires: alsa-lib-devel >= 1.0.10
#BuildRequires: jack-audio-connection-kit-devel >= 0.61.0 #jack seems deprecated to portaudio
-BuildRequires: qt4-devel
+BuildRequires: qt4-devel >= 4.3
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libid3tag-devel
@@ -25,6 +25,7 @@
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
BuildRequires: portaudio-devel
+BuildRequires: portmidi-devel
#Optionals Requirements
#BuildRequires: ffmpeg-devel
@@ -35,6 +36,7 @@
%{?_with_djconsole:BuildRequires: libdjconsole-devel}
BuildRequires: ladspa-devel
%{?_with_libgpod:BuildRequires: libgpod-devel}
+BuildRequires: wavpack-devel
@@ -60,7 +62,9 @@
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
scons %{?_smp_mflags} \
- prefix=%{_prefix} ladspa=1 \
+ prefix=%{_prefix} \
+ qtdir=%{_qt4_prefix} \
+ ladspa=0 \
shoutcast=0 hifieq=1 script=0 optimize=0 \
%{?_with_bpm: experimentalbpm=1} \
%{?_with_djconsole: djconsole=1} \
@@ -115,6 +119,9 @@
%{_datadir}/pixmaps/mixxx-icon.png
%changelog
+* Wed Oct 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.8.0.2-1
+- Update to 1.8.0.2
+
* Mon Sep 06 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.7.2-1
- Update to 1.7.2
13 years, 6 months
rpms/snes9x/F-13 snes9x-1.52-core.fix4.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 snes9x.spec, 1.4, 1.5 sources, 1.2, 1.3 snes9x-1.43-wmclass.patch, 1.1, NONE snes9x-1.51-src-fixes.patch, 1.1, NONE
by Matthias Saou
Author: thias
Update of /cvs/nonfree/rpms/snes9x/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30627
Modified Files:
.cvsignore snes9x.spec sources
Added Files:
snes9x-1.52-core.fix4.diff
Removed Files:
snes9x-1.43-wmclass.patch snes9x-1.51-src-fixes.patch
Log Message:
Update to 1.52.
snes9x-1.52-core.fix4.diff:
getset.h | 33 ++++++++++++++++++++++-----------
port.h | 2 ++
2 files changed, 24 insertions(+), 11 deletions(-)
--- NEW FILE snes9x-1.52-core.fix4.diff ---
Index: getset.h
===================================================================
--- getset.h (revision 1169)
+++ getset.h (working copy)
@@ -266,6 +266,7 @@
inline uint16 S9xGetWord (uint32 Address, enum s9xwrap_t w = WRAP_NONE)
{
+ uint16 ret;
uint32 mask = MEMMAP_MASK & (w == WRAP_PAGE ? 0xff : (w == WRAP_BANK ? 0xffff : 0xffffff));
if ((Address & mask) == mask)
{
@@ -309,7 +310,8 @@
switch ((pint) GetAddress)
{
case CMemory::MAP_CPU:
- return (S9xGetCPU(Address & 0xffff) | (S9xGetCPU((Address + 1) & 0xffff) << 8));
+ ret = S9xGetCPU(Address & 0xffff);
+ return (ret | (S9xGetCPU((Address + 1) & 0xffff) << 8));
case CMemory::MAP_PPU:
if (CPU.InDMAorHDMA)
@@ -317,9 +319,10 @@
OpenBus = S9xGetByte(Address);
return (OpenBus | (S9xGetByte(Address + 1) << 8));
}
+
+ ret = S9xGetPPU(Address & 0xffff);
+ return (ret | (S9xGetPPU((Address + 1) & 0xffff) << 8));
- return (S9xGetPPU(Address & 0xffff) | (S9xGetPPU((Address + 1) & 0xffff) << 8));
-
case CMemory::MAP_LOROM_SRAM:
case CMemory::MAP_SA1RAM:
if (Memory.SRAMMask >= MEMMAP_MASK)
@@ -347,28 +350,36 @@
return (READ_WORD(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)));
case CMemory::MAP_DSP:
- return (S9xGetDSP(Address & 0xffff) | (S9xGetDSP((Address + 1) & 0xffff) << 8));
+ ret = S9xGetDSP(Address & 0xffff);
+ return (ret | (S9xGetDSP((Address + 1) & 0xffff) << 8));
case CMemory::MAP_SPC7110_ROM:
- return (S9xGetSPC7110Byte(Address) | (S9xGetSPC7110Byte(Address + 1) << 8));
+ ret = S9xGetSPC7110Byte(Address);
+ return (ret | (S9xGetSPC7110Byte(Address + 1) << 8));
case CMemory::MAP_SPC7110_DRAM:
- return (S9xGetSPC7110(0x4800) | (S9xGetSPC7110(0x4800) << 8));
+ ret = S9xGetSPC7110(0x4800);
+ return (ret | (S9xGetSPC7110(0x4800) << 8));
case CMemory::MAP_C4:
- return (S9xGetC4(Address & 0xffff) | (S9xGetC4((Address + 1) & 0xffff) << 8));
+ ret = S9xGetC4(Address & 0xffff);
+ return (ret | (S9xGetC4((Address + 1) & 0xffff) << 8));
case CMemory::MAP_OBC_RAM:
- return (S9xGetOBC1(Address & 0xffff) | (S9xGetOBC1((Address + 1) & 0xffff) << 8));
+ ret = S9xGetOBC1(Address & 0xffff);
+ return (ret | (S9xGetOBC1((Address + 1) & 0xffff) << 8));
case CMemory::MAP_SETA_DSP:
- return (S9xGetSetaDSP(Address) | (S9xGetSetaDSP(Address + 1) << 8));
+ ret = S9xGetSetaDSP(Address);
+ return (ret | (S9xGetSetaDSP(Address + 1) << 8));
case CMemory::MAP_SETA_RISC:
- return (S9xGetST018(Address) | (S9xGetST018(Address + 1) << 8));
+ ret = S9xGetST018(Address);
+ return (ret | (S9xGetST018(Address + 1) << 8));
case CMemory::MAP_BSX:
- return (S9xGetBSX(Address) | (S9xGetBSX(Address + 1) << 8));
+ ret = S9xGetBSX(Address);
+ return (ret | (S9xGetBSX(Address + 1) << 8));
case CMemory::MAP_NONE:
default:
Index: port.h
===================================================================
--- port.h (revision 1169)
+++ port.h (working copy)
@@ -300,6 +300,8 @@
#define strncasecmp strnicmp
void WinDisplayStringFromBottom(const char *string, int linesFromBottom, int pixelsFromLeft, bool allowWrap);
#define S9xDisplayString WinDisplayStringFromBottom
+void SetInfoDlgColor(unsigned char, unsigned char, unsigned char);
+#define SET_UI_COLOR(r,g,b) SetInfoDlgColor(r,g,b)
#endif
#ifdef __DJGPP
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/snes9x/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Oct 2008 13:56:58 -0000 1.2
+++ .cvsignore 13 Oct 2010 09:25:11 -0000 1.3
@@ -1 +1 @@
-snes9x-1.51-src.tar.bz2
+snes9x-1.52-src.tar.bz2
Index: snes9x.spec
===================================================================
RCS file: /cvs/nonfree/rpms/snes9x/F-13/snes9x.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- snes9x.spec 6 May 2009 08:54:12 -0000 1.4
+++ snes9x.spec 13 Oct 2010 09:25:11 -0000 1.5
@@ -1,21 +1,24 @@
-#define prever -WIP1
-%define real_version 1.51
-
-Summary: Portable, freeware Super Nintendo Entertainment System (TM) emulator
+Summary: Super Nintendo Entertainment System emulator
Name: snes9x
-Version: 1.51
-Release: 4%{?dist}
+Version: 1.52
+Release: 1%{?dist}
License: Other
Group: Applications/Emulators
-URL: http://www.snes9x.com/
-Source: http://files.ipherswipsite.com/snes9x/snes9x-%{real_version}%{?prever}-sr...
-Patch0: snes9x-1.43-wmclass.patch
-Patch1: snes9x-1.51-src-fixes.patch
+URL: http://code.google.com/p/snes9x-gtk/
+Source: http://snes9x-gtk.googlecode.com/files/snes9x-%{version}-src.tar.bz2
+# http://download.sessionclan.de/overfiend/snes9x/snes9x-1.52-src.fix4.diff...
+Patch0: snes9x-1.52-core.fix4.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, zlib-devel, libpng-devel
-BuildRequires: libGL-devel, libGLU-devel
-BuildRequires: libXt-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel
+BuildRequires: gcc-c++
+BuildRequires: zlib-devel, libpng-devel
+BuildRequires: libXv-devel, libXrandr-devel
BuildRequires: nasm
+BuildRequires: intltool
+BuildRequires: gtk2-devel, libglade2-devel
+BuildRequires: SDL-devel
+BuildRequires: portaudio-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: pulseaudio-libs-devel
%description
Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)
@@ -24,45 +27,56 @@
%prep
-%setup -q -n %{name}-%{real_version}%{?prever:-dev}-src
-%patch0 -p2 -b .wmclass
-%patch1 -p1 -b .fixes
+%setup -q -n %{name}-%{version}-src
+%patch0 -p0 -b .fixes
%build
-# First, build the OpenGL version
-%configure --with-netplay --with-opengl
-# Replace OPTIMISE here, it's the best I've found...
-%{__perl} -pi.orig -e 's|^OPTIMISE.*|OPTIMISE = %{optflags}|g' Makefile
+# Workaround for all of the missing links (as of 1.52)
+export CFLAGS="%{optflags} -lX11 -ldl -lXext"
+export CXXFLAGS="%{optflags} -lX11 -ldl -lXext"
+# First, build the GTK version
+cd gtk
+%configure \
+ --without-oss \
+ --with-netplay
%{__make} %{?_smp_mflags}
-
-%{__make} clean
-
-# Second, build the normal X11 version
-%configure --with-netplay
-# Replace OPTIMISE here, it's the best I've found...
-%{__perl} -pi.orig -e 's|^OPTIMISE.*|OPTIMISE = %{optflags}|g' Makefile
+cd ..
+# Second, build the CLI version
+cd unix
+%configure \
+ --enable-netplay
%{__make} %{?_smp_mflags}
+cd ..
%install
%{__rm} -rf %{buildroot}
-%{__install} -D -m 0755 osnes9x %{buildroot}%{_bindir}/osnes9x
-%{__install} -D -m 0755 snes9x %{buildroot}%{_bindir}/snes9x
+cd gtk
+%{__make} install DESTDIR=%{buildroot}
+cd ..
+%find_lang snes9x-gtk
+%{__install} -p -m 0755 unix/snes9x %{buildroot}%{_bindir}/snes9x
%clean
%{__rm} -rf %{buildroot}
-%files
+%files -f snes9x-gtk.lang
%defattr(-,root,root,-)
-%doc doc/* unix/docs/readme_unix.txt
-%{_bindir}/osnes9x
+%doc gtk/doc/* unix/docs/readme_unix.html
%{_bindir}/snes9x
+%{_bindir}/snes9x-gtk
+%{_datadir}/applications/snes9x.desktop
+%{_datadir}/icons/hicolor/*/apps/snes9x.*
%changelog
+* Wed Aug 11 2010 Matthias Saou <http://freshrpms.net/> 1.52-1
+- Update to 1.52, which is now hosted at google (sort of a unique fork).
+- Now include the new gtk version, it also supports OpenGL.
+
* Wed May 6 2009 Matthias Saou <http://freshrpms.net/> 1.51-4
- Include patch to fix the current compilation errors.
- Quiet setup.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/snes9x/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Oct 2008 13:56:58 -0000 1.2
+++ sources 13 Oct 2010 09:25:11 -0000 1.3
@@ -1 +1 @@
-a1038cc761f400318cdced960972f8a7 snes9x-1.51-src.tar.bz2
+813bd3a0f99732ee0238a2c8ab417725 snes9x-1.52-src.tar.bz2
--- snes9x-1.43-wmclass.patch DELETED ---
--- snes9x-1.51-src-fixes.patch DELETED ---
13 years, 6 months
rpms/snes9x/devel snes9x-1.52-core.fix4.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 snes9x.spec, 1.4, 1.5 sources, 1.2, 1.3 snes9x-1.43-wmclass.patch, 1.1, NONE snes9x-1.51-src-fixes.patch, 1.1, NONE
by Matthias Saou
Author: thias
Update of /cvs/nonfree/rpms/snes9x/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13886
Modified Files:
.cvsignore snes9x.spec sources
Added Files:
snes9x-1.52-core.fix4.diff
Removed Files:
snes9x-1.43-wmclass.patch snes9x-1.51-src-fixes.patch
Log Message:
Update to 1.52 at last.
snes9x-1.52-core.fix4.diff:
getset.h | 33 ++++++++++++++++++++++-----------
port.h | 2 ++
2 files changed, 24 insertions(+), 11 deletions(-)
--- NEW FILE snes9x-1.52-core.fix4.diff ---
Index: getset.h
===================================================================
--- getset.h (revision 1169)
+++ getset.h (working copy)
@@ -266,6 +266,7 @@
inline uint16 S9xGetWord (uint32 Address, enum s9xwrap_t w = WRAP_NONE)
{
+ uint16 ret;
uint32 mask = MEMMAP_MASK & (w == WRAP_PAGE ? 0xff : (w == WRAP_BANK ? 0xffff : 0xffffff));
if ((Address & mask) == mask)
{
@@ -309,7 +310,8 @@
switch ((pint) GetAddress)
{
case CMemory::MAP_CPU:
- return (S9xGetCPU(Address & 0xffff) | (S9xGetCPU((Address + 1) & 0xffff) << 8));
+ ret = S9xGetCPU(Address & 0xffff);
+ return (ret | (S9xGetCPU((Address + 1) & 0xffff) << 8));
case CMemory::MAP_PPU:
if (CPU.InDMAorHDMA)
@@ -317,9 +319,10 @@
OpenBus = S9xGetByte(Address);
return (OpenBus | (S9xGetByte(Address + 1) << 8));
}
+
+ ret = S9xGetPPU(Address & 0xffff);
+ return (ret | (S9xGetPPU((Address + 1) & 0xffff) << 8));
- return (S9xGetPPU(Address & 0xffff) | (S9xGetPPU((Address + 1) & 0xffff) << 8));
-
case CMemory::MAP_LOROM_SRAM:
case CMemory::MAP_SA1RAM:
if (Memory.SRAMMask >= MEMMAP_MASK)
@@ -347,28 +350,36 @@
return (READ_WORD(Memory.BWRAM + ((Address & 0x7fff) - 0x6000)));
case CMemory::MAP_DSP:
- return (S9xGetDSP(Address & 0xffff) | (S9xGetDSP((Address + 1) & 0xffff) << 8));
+ ret = S9xGetDSP(Address & 0xffff);
+ return (ret | (S9xGetDSP((Address + 1) & 0xffff) << 8));
case CMemory::MAP_SPC7110_ROM:
- return (S9xGetSPC7110Byte(Address) | (S9xGetSPC7110Byte(Address + 1) << 8));
+ ret = S9xGetSPC7110Byte(Address);
+ return (ret | (S9xGetSPC7110Byte(Address + 1) << 8));
case CMemory::MAP_SPC7110_DRAM:
- return (S9xGetSPC7110(0x4800) | (S9xGetSPC7110(0x4800) << 8));
+ ret = S9xGetSPC7110(0x4800);
+ return (ret | (S9xGetSPC7110(0x4800) << 8));
case CMemory::MAP_C4:
- return (S9xGetC4(Address & 0xffff) | (S9xGetC4((Address + 1) & 0xffff) << 8));
+ ret = S9xGetC4(Address & 0xffff);
+ return (ret | (S9xGetC4((Address + 1) & 0xffff) << 8));
case CMemory::MAP_OBC_RAM:
- return (S9xGetOBC1(Address & 0xffff) | (S9xGetOBC1((Address + 1) & 0xffff) << 8));
+ ret = S9xGetOBC1(Address & 0xffff);
+ return (ret | (S9xGetOBC1((Address + 1) & 0xffff) << 8));
case CMemory::MAP_SETA_DSP:
- return (S9xGetSetaDSP(Address) | (S9xGetSetaDSP(Address + 1) << 8));
+ ret = S9xGetSetaDSP(Address);
+ return (ret | (S9xGetSetaDSP(Address + 1) << 8));
case CMemory::MAP_SETA_RISC:
- return (S9xGetST018(Address) | (S9xGetST018(Address + 1) << 8));
+ ret = S9xGetST018(Address);
+ return (ret | (S9xGetST018(Address + 1) << 8));
case CMemory::MAP_BSX:
- return (S9xGetBSX(Address) | (S9xGetBSX(Address + 1) << 8));
+ ret = S9xGetBSX(Address);
+ return (ret | (S9xGetBSX(Address + 1) << 8));
case CMemory::MAP_NONE:
default:
Index: port.h
===================================================================
--- port.h (revision 1169)
+++ port.h (working copy)
@@ -300,6 +300,8 @@
#define strncasecmp strnicmp
void WinDisplayStringFromBottom(const char *string, int linesFromBottom, int pixelsFromLeft, bool allowWrap);
#define S9xDisplayString WinDisplayStringFromBottom
+void SetInfoDlgColor(unsigned char, unsigned char, unsigned char);
+#define SET_UI_COLOR(r,g,b) SetInfoDlgColor(r,g,b)
#endif
#ifdef __DJGPP
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/snes9x/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Oct 2008 13:56:58 -0000 1.2
+++ .cvsignore 12 Oct 2010 21:49:24 -0000 1.3
@@ -1 +1 @@
-snes9x-1.51-src.tar.bz2
+snes9x-1.52-src.tar.bz2
Index: snes9x.spec
===================================================================
RCS file: /cvs/nonfree/rpms/snes9x/devel/snes9x.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- snes9x.spec 6 May 2009 08:54:12 -0000 1.4
+++ snes9x.spec 12 Oct 2010 21:49:24 -0000 1.5
@@ -1,21 +1,24 @@
-#define prever -WIP1
-%define real_version 1.51
-
-Summary: Portable, freeware Super Nintendo Entertainment System (TM) emulator
+Summary: Super Nintendo Entertainment System emulator
Name: snes9x
-Version: 1.51
-Release: 4%{?dist}
+Version: 1.52
+Release: 1%{?dist}
License: Other
Group: Applications/Emulators
-URL: http://www.snes9x.com/
-Source: http://files.ipherswipsite.com/snes9x/snes9x-%{real_version}%{?prever}-sr...
-Patch0: snes9x-1.43-wmclass.patch
-Patch1: snes9x-1.51-src-fixes.patch
+URL: http://code.google.com/p/snes9x-gtk/
+Source: http://snes9x-gtk.googlecode.com/files/snes9x-%{version}-src.tar.bz2
+# http://download.sessionclan.de/overfiend/snes9x/snes9x-1.52-src.fix4.diff...
+Patch0: snes9x-1.52-core.fix4.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, zlib-devel, libpng-devel
-BuildRequires: libGL-devel, libGLU-devel
-BuildRequires: libXt-devel, libXext-devel, libXxf86dga-devel, libXxf86vm-devel
+BuildRequires: gcc-c++
+BuildRequires: zlib-devel, libpng-devel
+BuildRequires: libXv-devel, libXrandr-devel
BuildRequires: nasm
+BuildRequires: intltool
+BuildRequires: gtk2-devel, libglade2-devel
+BuildRequires: SDL-devel
+BuildRequires: portaudio-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: pulseaudio-libs-devel
%description
Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES)
@@ -24,45 +27,56 @@
%prep
-%setup -q -n %{name}-%{real_version}%{?prever:-dev}-src
-%patch0 -p2 -b .wmclass
-%patch1 -p1 -b .fixes
+%setup -q -n %{name}-%{version}-src
+%patch0 -p0 -b .fixes
%build
-# First, build the OpenGL version
-%configure --with-netplay --with-opengl
-# Replace OPTIMISE here, it's the best I've found...
-%{__perl} -pi.orig -e 's|^OPTIMISE.*|OPTIMISE = %{optflags}|g' Makefile
+# Workaround for all of the missing links (as of 1.52)
+export CFLAGS="%{optflags} -lX11 -ldl -lXext"
+export CXXFLAGS="%{optflags} -lX11 -ldl -lXext"
+# First, build the GTK version
+cd gtk
+%configure \
+ --without-oss \
+ --with-netplay
%{__make} %{?_smp_mflags}
-
-%{__make} clean
-
-# Second, build the normal X11 version
-%configure --with-netplay
-# Replace OPTIMISE here, it's the best I've found...
-%{__perl} -pi.orig -e 's|^OPTIMISE.*|OPTIMISE = %{optflags}|g' Makefile
+cd ..
+# Second, build the CLI version
+cd unix
+%configure \
+ --enable-netplay
%{__make} %{?_smp_mflags}
+cd ..
%install
%{__rm} -rf %{buildroot}
-%{__install} -D -m 0755 osnes9x %{buildroot}%{_bindir}/osnes9x
-%{__install} -D -m 0755 snes9x %{buildroot}%{_bindir}/snes9x
+cd gtk
+%{__make} install DESTDIR=%{buildroot}
+cd ..
+%find_lang snes9x-gtk
+%{__install} -p -m 0755 unix/snes9x %{buildroot}%{_bindir}/snes9x
%clean
%{__rm} -rf %{buildroot}
-%files
+%files -f snes9x-gtk.lang
%defattr(-,root,root,-)
-%doc doc/* unix/docs/readme_unix.txt
-%{_bindir}/osnes9x
+%doc gtk/doc/* unix/docs/readme_unix.html
%{_bindir}/snes9x
+%{_bindir}/snes9x-gtk
+%{_datadir}/applications/snes9x.desktop
+%{_datadir}/icons/hicolor/*/apps/snes9x.*
%changelog
+* Wed Aug 11 2010 Matthias Saou <http://freshrpms.net/> 1.52-1
+- Update to 1.52, which is now hosted at google (sort of a unique fork).
+- Now include the new gtk version, it also supports OpenGL.
+
* Wed May 6 2009 Matthias Saou <http://freshrpms.net/> 1.51-4
- Include patch to fix the current compilation errors.
- Quiet setup.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/snes9x/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Oct 2008 13:56:58 -0000 1.2
+++ sources 12 Oct 2010 21:49:24 -0000 1.3
@@ -1 +1 @@
-a1038cc761f400318cdced960972f8a7 snes9x-1.51-src.tar.bz2
+813bd3a0f99732ee0238a2c8ab417725 snes9x-1.52-src.tar.bz2
--- snes9x-1.43-wmclass.patch DELETED ---
--- snes9x-1.51-src-fixes.patch DELETED ---
13 years, 6 months