rpms/sonic-visualiser-freeworld/devel sonic-visualiser-1.8-gcc46.patch, NONE, 1.1 sonic-visualiser-1.8-implicit-dso.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sonic-visualiser-freeworld.desktop, 1.1, 1.2 sonic-visualiser-freeworld.spec, 1.3, 1.4 sources, 1.4, 1.5 sonic-visualiser-1.5-alsa.patch, 1.1, NONE sonic-visualiser-1.5-gcc44.patch, 1.1, NONE
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/sonic-visualiser-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12958
Modified Files:
.cvsignore sonic-visualiser-freeworld.desktop
sonic-visualiser-freeworld.spec sources
Added Files:
sonic-visualiser-1.8-gcc46.patch
sonic-visualiser-1.8-implicit-dso.patch
Removed Files:
sonic-visualiser-1.5-alsa.patch
sonic-visualiser-1.5-gcc44.patch
Log Message:
* Tue Jun 21 2011 Michel Salim <salimma(a)fedoraproject.org> - 1.8-1
- Update to 1.8
sonic-visualiser-1.8-gcc46.patch:
ResizeableBitset.h | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE sonic-visualiser-1.8-gcc46.patch ---
--- sonic-visualiser-1.8/svcore/base/ResizeableBitset.h.gcc46 2011-04-08 17:56:35.000000000 +0200
+++ sonic-visualiser-1.8/svcore/base/ResizeableBitset.h 2011-05-31 22:56:21.853692417 +0200
@@ -17,6 +17,7 @@
#define _RESIZEABLE_BITMAP_H_
#include <vector>
+#include <cstddef>
#include <stdint.h>
class ResizeableBitset {
sonic-visualiser-1.8-implicit-dso.patch:
sonic-visualiser.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE sonic-visualiser-1.8-implicit-dso.patch ---
--- sonic-visualiser-1.8/sonic-visualiser/sonic-visualiser.pro.implicit-dso 2011-04-08 17:56:20.000000000 +0200
+++ sonic-visualiser-1.8/sonic-visualiser/sonic-visualiser.pro 2011-05-31 23:11:17.157498460 +0200
@@ -23,7 +23,7 @@
contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
-LIBS = -L../svapp -L../svgui -L../svcore -lsvapp -lsvgui -lsvcore $$LIBS
+LIBS = -L../svapp -L../svgui -L../svcore -lsvapp -lsvgui -lsvcore -lX11 $$LIBS
PRE_TARGETDEPS += ../svapp/libsvapp.a \
../svgui/libsvgui.a \
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 13 Jun 2010 21:09:41 -0000 1.4
+++ .cvsignore 21 Jun 2011 20:42:44 -0000 1.5
@@ -1 +1 @@
-sonic-visualiser-1.7.2.tar.bz2
+sonic-visualiser-1.8.tar.gz
Index: sonic-visualiser-freeworld.desktop
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/devel/sonic-visualiser-freeworld.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sonic-visualiser-freeworld.desktop 13 Jan 2010 03:07:15 -0000 1.1
+++ sonic-visualiser-freeworld.desktop 21 Jun 2011 20:42:45 -0000 1.2
@@ -1,12 +1,9 @@
[Desktop Entry]
Name=Sonic Visualiser (Freeworld)
-GenericName=Audio visualization tool
-Comment=Audio visualization tool
-Categories=AudioVideo;Viewer;Player;X-DigitalProcessing;
-Encoding=UTF-8
+GenericName=Audio visualisation tool
Exec=sonic-visualiser-freeworld %U
-Icon=sonic-visualiser-freeworld
-MimeType=application/x-flac;audio/x-flac;audio/wav;audio/x-wav;audio/x-pn-wav;audio/x-mp3;application/x-ogg;application/ogg;audio/ogg;
-StartupNotify=true
Terminal=false
Type=Application
+Icon=sonic-visualiser-freeworld
+Categories=Audio;AudioVideo;
+MimeType=application/x-sonicvisualiser;application/x-sonicvisualiser-layer;application/x-ogg;audio/mp3;audio/mpeg;audio/mpegurl;audio/x-flac;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-wav;audio/wav;application/ogg;audio/x-vorbis+ogg;
Index: sonic-visualiser-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/devel/sonic-visualiser-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sonic-visualiser-freeworld.spec 13 Jun 2010 21:09:41 -0000 1.3
+++ sonic-visualiser-freeworld.spec 21 Jun 2011 20:42:45 -0000 1.4
@@ -1,15 +1,15 @@
Name: sonic-visualiser-freeworld
-Version: 1.7.2
+Version: 1.8
Release: 1%{?dist}
Summary: A program for viewing and exploring audio data
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.sonicvisualiser.org/
-Source0: http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sv1/sonic-visualiser-%{version}.tar.gz
Source1: sonic-visualiser-freeworld.desktop
-Patch0: sonic-visualiser-1.5-gcc44.patch
-Patch1: sonic-visualiser-1.5-alsa.patch
+Patch0: sonic-visualiser-1.8-gcc46.patch
+Patch1: sonic-visualiser-1.8-implicit-dso.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel vamp-plugin-sdk-devel
@@ -17,13 +17,13 @@
BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: redland-devel rubberband-devel
-BuildRequires: libmad-devel
+BuildRequires: libmad-devel
BuildRequires: liboggz-devel libfishsound-devel liblo-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
-Sonic Visualiser is an application for viewing and analysing the
+Sonic Visualiser is an application for viewing and analyzing the
contents of music audio files.
The aim of Sonic Visualiser is to be the first program you reach for
@@ -38,16 +38,16 @@
%prep
-%setup -q -n sonic-visualiser-%{version}
-# https://sourceforge.net/tracker/?func=detail&aid=2715387&group_id=162924&...
-%patch0 -p1 -b .gcc44
-# https://sourceforge.net/tracker/?func=detail&aid=2715381&group_id=162924&...
-%patch1 -p1 -b .alsa
+%setup -q
+%patch0 -p1 -b .gcc46
+%patch1 -p1 -b .implicit-dso
%build
-qmake-qt4
-make %{?_smp_mflags}
+%configure
+#qmake-qt4
+#make {?_smp_mflags}
+make
%install
@@ -55,14 +55,15 @@
# install does nothing right now
# make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 -p sv/sonic-visualiser \
+install -m 755 -p sonic-visualiser/sonic-visualiser \
$RPM_BUILD_ROOT%{_bindir}/%{name}
# desktop file and icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -m 644 -p sv/icons/sv-48x48.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE1}
+for s in 16 22 24 32 48 64 128; do
+ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps
+ install -m 644 -p sonic-visualiser/icons/sv-${s}x${s}.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png
+done
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
%clean
@@ -71,12 +72,14 @@
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+update-desktop-database &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -84,19 +87,45 @@
%files
%defattr(-,root,root,-)
-%doc COPYING README README.OSC
+%doc sonic-visualiser/CHANGELOG sonic-visualiser/COPYING sonic-visualiser/README sonic-visualiser/README.OSC
%{_bindir}/sonic-visualiser-freeworld
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/*.png
%changelog
-* Sun Jun 13 2010 Michel Salim <salimma(a)fedoraproject.org> - 1.7.2-1
-- Update to 1.7.2
+* Tue Jun 21 2011 Michel Salim <salimma(a)fedoraproject.org> - 1.8-1
+- Update to 1.8
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.7.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jul 20 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.7.2-2
+- Rebuild against new liblo-0.26
+
+* Wed Jun 02 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 1.7.2-1
+- Updated to 1.7.2
+- Release Notes:
+- (reference: https://sourceforge.net/projects/sv1/files/sonic-visualiser/1.7.2/CHANGEL...)
+- The time-value layer now has an origin line and an option to
+ show derivatives (change from one point to the next) rather than
+ raw values
+- A crash when pressing Play straight after New Session has been
+ fixed
+- Builds with latest liboggz
+
+* Wed Jun 02 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 1.7.1-2
+- Bump for new liboggz lib
* Wed Jan 13 2010 Michel Salim <salimma(a)fedoraproject.org> - 1.7.1-1
- Update to 1.7.1
+* Sun Jan 03 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.6-6
+- rebuild (redland)
+
+* Sun Jan 03 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.6-5
+- rebuild (rasqal/redland)
+
* Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.6-4
- Update desktop file according to F-12 FedoraStudio feature
Index: sources
===================================================================
RCS file: /cvs/free/rpms/sonic-visualiser-freeworld/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 13 Jun 2010 21:09:41 -0000 1.4
+++ sources 21 Jun 2011 20:42:45 -0000 1.5
@@ -1 +1 @@
-06b31cd07eee708d33aba46cb2d20fe2 sonic-visualiser-1.7.2.tar.bz2
+ad676d0b4cf5b8561306487f52642862 sonic-visualiser-1.8.tar.gz
--- sonic-visualiser-1.5-alsa.patch DELETED ---
--- sonic-visualiser-1.5-gcc44.patch DELETED ---
12 years, 10 months
rpms/ProjectX/devel .cvsignore, 1.2, 1.3 ProjectX.spec, 1.4, 1.5 sources, 1.2, 1.3 ProjectX-snapshot.sh, 1.1, NONE
by Göran Uddeborg
Author: goeran
Update of /cvs/free/rpms/ProjectX/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8462
Modified Files:
.cvsignore ProjectX.spec sources
Removed Files:
ProjectX-snapshot.sh
Log Message:
* Sun Jun 19 2011 Göran Uddeborg <goeran(a)uddeborg.se> - 0.91.0
- New upstreams version. This is an official release, not a snapshot
any more.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ProjectX/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 7 Sep 2010 11:54:02 -0000 1.2
+++ .cvsignore 21 Jun 2011 19:50:05 -0000 1.3
@@ -1 +1 @@
-ProjectX-0.90.4.00-20100806cvs.tar.xz
+ProjectX_0.91.0.zip
Index: ProjectX.spec
===================================================================
RCS file: /cvs/free/rpms/ProjectX/devel/ProjectX.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProjectX.spec 13 Jun 2011 20:22:01 -0000 1.4
+++ ProjectX.spec 21 Jun 2011 19:50:05 -0000 1.5
@@ -1,8 +1,6 @@
-%global cvs 20100806cvs
-
Name: ProjectX
-Version: 0.90.4.00
-Release: 10.%cvs%{?dist}
+Version: 0.91.0
+Release: 1
Summary: DVB video editing and demultiplexing tool
Summary(sv): Verktyg för redigering och demultiplexning av DVB-video
@@ -10,15 +8,7 @@
License: GPLv2+
URL: http://project-x.sourceforge.net/
-# A CVS snapshot is used rather than the latest official release, see
-# https://bugzilla.rpmfusion.org/show_bug.cgi?id=985#c6
-#
-# Use the ProjectX-snapshot.sh (source 1) script to reproduce. Before
-# the first time, do this:
-#
-# cvs -d:pserver:anonymous@project-x.cvs.sourceforge.net:/cvsroot/project-x login
-Source0: %name-%version-%cvs.tar.xz
-Source1: %name-snapshot.sh
+Source: http://downloads.sourceforge.net/project/project-x/project-x/%{name}_%ver...
Patch0: %name-0.90.4.00-20100801cvs.sysjava.patch
Patch1: %name-0.90.4.00-20100806cvs.desktop.patch
Patch2: %name-0.90.4.00-20100806cvs.helpfiles.patch
@@ -52,7 +42,7 @@
%prep
-%setup0 -q -n %name-%version-%cvs
+%setup -q -n Project-X_%version
%patch0
%patch1
%patch2
@@ -79,6 +69,10 @@
%changelog
+* Sun Jun 19 2011 Göran Uddeborg <goeran(a)uddeborg.se> - 0.91.0
+- New upstreams version. This is an official release, not a snapshot
+ any more.
+
* Mon Jun 13 2011 Göran Uddeborg <goeran(a)uddeborg.se> - 0.90.4.00-10.20100806cvs
- Adjust to updated packaging guidelines:
- + Build wrapper script using the jpackage_script macro.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ProjectX/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Sep 2010 11:54:02 -0000 1.2
+++ sources 21 Jun 2011 19:50:05 -0000 1.3
@@ -1 +1 @@
-6ebcb2b470fc492ad6577884e60d8dfe ProjectX-0.90.4.00-20100806cvs.tar.xz
+5cf7bb227abe2c16d34e8e9c84915291 ProjectX_0.91.0.zip
--- ProjectX-snapshot.sh DELETED ---
12 years, 10 months
rpms/bsnes/devel bsnes-0.079-crashfix.patch, NONE, 1.1 bsnes-0.079-gcc46.patch, NONE, 1.1 bsnes-0.079-nocheats.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 bsnes.spec, 1.40, 1.41 sources, 1.29, 1.30 bsnes-0.064-systemlibs.patch, 1.1, NONE bsnes-0.068-newppcelf.patch, 1.1, NONE bsnes-0.068-noppcelfppc64.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30764
Modified Files:
.cvsignore bsnes.spec sources
Added Files:
bsnes-0.079-crashfix.patch bsnes-0.079-gcc46.patch
bsnes-0.079-nocheats.patch
Removed Files:
bsnes-0.064-systemlibs.patch bsnes-0.068-newppcelf.patch
bsnes-0.068-noppcelfppc64.patch
Log Message:
* Tue Jun 21 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.079-1
- Updated to 0.079
- Dropped subpackages, they are too small to be worth it
- Updated the Fedora readme
- Added patches by Themaister
bsnes-0.079-crashfix.patch:
amd64.c | 130 +++++++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 84 insertions(+), 46 deletions(-)
--- NEW FILE bsnes-0.079-crashfix.patch ---
diff -up bsnes_v079-source/bsnes/libco/amd64.c.crashfix bsnes_v079-source/bsnes/libco/amd64.c
--- bsnes_v079-source/bsnes/libco/amd64.c.crashfix 2011-06-04 05:55:17.000000000 +0200
+++ bsnes_v079-source/bsnes/libco/amd64.c 2011-06-21 00:09:44.398210519 +0200
@@ -13,52 +13,94 @@
extern "C" {
#endif
+// ASM co_swap.
+void co_swap(cothread_t new_active, cothread_t old_active);
+
static thread_local long long co_active_buffer[64];
static thread_local cothread_t co_active_handle = 0;
-static void (*co_swap)(cothread_t, cothread_t) = 0;
#ifdef _WIN32
- //ABI: Win64
- static unsigned char co_swap_function[] = {
- 0x48, 0x89, 0x22, 0x48, 0x8B, 0x21, 0x58, 0x48, 0x89, 0x6A, 0x08, 0x48, 0x89, 0x72, 0x10, 0x48,
- 0x89, 0x7A, 0x18, 0x48, 0x89, 0x5A, 0x20, 0x4C, 0x89, 0x62, 0x28, 0x4C, 0x89, 0x6A, 0x30, 0x4C,
- 0x89, 0x72, 0x38, 0x4C, 0x89, 0x7A, 0x40, 0x48, 0x81, 0xC2, 0x80, 0x00, 0x00, 0x00, 0x48, 0x83,
- 0xE2, 0xF0, 0x0F, 0x29, 0x32, 0x0F, 0x29, 0x7A, 0x10, 0x44, 0x0F, 0x29, 0x42, 0x20, 0x44, 0x0F,
- 0x29, 0x4A, 0x30, 0x44, 0x0F, 0x29, 0x52, 0x40, 0x44, 0x0F, 0x29, 0x5A, 0x50, 0x44, 0x0F, 0x29,
- 0x62, 0x60, 0x44, 0x0F, 0x29, 0x6A, 0x70, 0x44, 0x0F, 0x29, 0xB2, 0x80, 0x00, 0x00, 0x00, 0x44,
- 0x0F, 0x29, 0xBA, 0x90, 0x00, 0x00, 0x00, 0x48, 0x8B, 0x69, 0x08, 0x48, 0x8B, 0x71, 0x10, 0x48,
- 0x8B, 0x79, 0x18, 0x48, 0x8B, 0x59, 0x20, 0x4C, 0x8B, 0x61, 0x28, 0x4C, 0x8B, 0x69, 0x30, 0x4C,
- 0x8B, 0x71, 0x38, 0x4C, 0x8B, 0x79, 0x40, 0x48, 0x81, 0xC1, 0x80, 0x00, 0x00, 0x00, 0x48, 0x83,
- 0xE1, 0xF0, 0x0F, 0x29, 0x31, 0x0F, 0x29, 0x79, 0x10, 0x44, 0x0F, 0x29, 0x41, 0x20, 0x44, 0x0F,
- 0x29, 0x49, 0x30, 0x44, 0x0F, 0x29, 0x51, 0x40, 0x44, 0x0F, 0x29, 0x59, 0x50, 0x44, 0x0F, 0x29,
- 0x61, 0x60, 0x44, 0x0F, 0x29, 0x69, 0x70, 0x44, 0x0F, 0x29, 0xB1, 0x80, 0x00, 0x00, 0x00, 0x44,
- 0x0F, 0x29, 0xB9, 0x90, 0x00, 0x00, 0x00, 0xFF, 0xE0,
- };
-
- #include <windows.h>
-
- void co_init() {
- DWORD old_privileges;
- VirtualProtect(co_swap_function, sizeof co_swap_function, PAGE_EXECUTE_READWRITE, &old_privileges);
- }
+asm (
+ ".text\n"
+ ".globl co_swap\n"
+ "co_swap:\n"
+
+ "movq %rsp, (%rdx) # Save stack pointer and pop old back\n"
+ "movq (%rcx), %rsp\n"
+
+ "popq %rax # Pop saved PC to %rax\n"
+
+ "movq %rbp, 0x8(%rdx) # Save non-volatile registers\n"
+ "movq %rsi, 0x10(%rdx)\n"
+ "movq %rdi, 0x18(%rdx)\n"
+ "movq %rbx, 0x20(%rdx)\n"
+ "movq %r12, 0x28(%rdx)\n"
+ "movq %r13, 0x30(%rdx)\n"
+ "movq %r14, 0x38(%rdx)\n"
+ "movq %r15, 0x40(%rdx)\n"
+
+ "addq $0x80, %rdx\n"
+ "andq $0xfffffffffffffff0, %rdx # Align buffer to 16 bytes (SSE).\n"
+ "movaps %xmm6, (%rdx) # Also save non-volatile vector registers.\n"
+ "movaps %xmm7, 0x10(%rdx)\n"
+ "movaps %xmm8, 0x20(%rdx)\n"
+ "movaps %xmm9, 0x30(%rdx)\n"
+ "movaps %xmm10, 0x40(%rdx)\n"
+ "movaps %xmm11, 0x50(%rdx)\n"
+ "movaps %xmm12, 0x60(%rdx)\n"
+ "movaps %xmm13, 0x70(%rdx)\n"
+ "movaps %xmm14, 0x80(%rdx)\n"
+ "movaps %xmm15, 0x90(%rdx)\n"
+
+ "movq 0x8(%rcx), %rbp # Pop back our saved registers and vector registers.\n"
+ "movq 0x10(%rcx), %rsi\n"
+ "movq 0x18(%rcx), %rdi\n"
+ "movq 0x20(%rcx), %rbx\n"
+ "movq 0x28(%rcx), %r12\n"
+ "movq 0x30(%rcx), %r13\n"
+ "movq 0x38(%rcx), %r14\n"
+ "movq 0x40(%rcx), %r15\n"
+
+ "addq $0x80, %rcx\n"
+ "andq $0xfffffffffffffff0, %rcx\n"
+ "movaps %xmm6, (%rcx)\n"
+ "movaps %xmm7, 0x10(%rcx)\n"
+ "movaps %xmm8, 0x20(%rcx)\n"
+ "movaps %xmm9, 0x30(%rcx)\n"
+ "movaps %xmm10, 0x40(%rcx)\n"
+ "movaps %xmm11, 0x50(%rcx)\n"
+ "movaps %xmm12, 0x60(%rcx)\n"
+ "movaps %xmm13, 0x70(%rcx)\n"
+ "movaps %xmm14, 0x80(%rcx)\n"
+ "movaps %xmm15, 0x90(%rcx)\n"
+ "jmpq *%rax # Jump back to old saved PC.\n"
+);
#else
- //ABI: SystemV
- static unsigned char co_swap_function[] = {
- 0x48, 0x89, 0x26, 0x48, 0x8B, 0x27, 0x58, 0x48, 0x89, 0x6E, 0x08, 0x48, 0x89, 0x5E, 0x10, 0x4C,
- 0x89, 0x66, 0x18, 0x4C, 0x89, 0x6E, 0x20, 0x4C, 0x89, 0x76, 0x28, 0x4C, 0x89, 0x7E, 0x30, 0x48,
- 0x8B, 0x6F, 0x08, 0x48, 0x8B, 0x5F, 0x10, 0x4C, 0x8B, 0x67, 0x18, 0x4C, 0x8B, 0x6F, 0x20, 0x4C,
- 0x8B, 0x77, 0x28, 0x4C, 0x8B, 0x7F, 0x30, 0xFF, 0xE0,
- };
-
- #include <unistd.h>
- #include <sys/mman.h>
-
- void co_init() {
- unsigned long long addr = (unsigned long long)co_swap_function;
- unsigned long long base = addr - (addr % sysconf(_SC_PAGESIZE));
- unsigned long long size = (addr - base) + sizeof co_swap_function;
- mprotect((void*)base, size, PROT_READ | PROT_WRITE | PROT_EXEC);
- }
+asm (
+ ".text\n"
+ ".globl co_swap\n"
+ ".globl _co_swap\n"
+ "_co_swap:\n"
+ "co_swap:\n"
+ "movq %rsp, (%rsi) # Save stack pointer, and pop the old one back.\n"
+ "movq (%rdi), %rsp\n"
+ "popq %rax\n"
+
+ "movq %rbp, 0x8(%rsi) # Save our non-volatile registers to buffer.\n"
+ "movq %rbx, 0x10(%rsi)\n"
+ "movq %r12, 0x18(%rsi)\n"
+ "movq %r13, 0x20(%rsi)\n"
+ "movq %r14, 0x28(%rsi)\n"
+ "movq %r15, 0x30(%rsi)\n"
+
+ "movq 0x8(%rdi), %rbp # Pop back our saved registers.\n"
+ "movq 0x10(%rdi), %rbx\n"
+ "movq 0x18(%rdi), %r12\n"
+ "movq 0x20(%rdi), %r13\n"
+ "movq 0x28(%rdi), %r14\n"
+ "movq 0x30(%rdi), %r15\n"
+ "jmpq *%rax # Jump back to saved PC.\n"
+);
#endif
static void crash() {
@@ -72,15 +114,11 @@ cothread_t co_active() {
cothread_t co_create(unsigned int size, void (*entrypoint)(void)) {
cothread_t handle;
- if(!co_swap) {
- co_init();
- co_swap = (void (*)(cothread_t, cothread_t))co_swap_function;
- }
if(!co_active_handle) co_active_handle = &co_active_buffer;
size += 512; /* allocate additional space for storage */
size &= ~15; /* align stack to 16-byte boundary */
- if(handle = (cothread_t)malloc(size)) {
+ if((handle = (cothread_t)malloc(size))) {
long long *p = (long long*)((char*)handle + size); /* seek to top of stack */
*--p = (long long)crash; /* crash if entrypoint returns */
*--p = (long long)entrypoint; /* start of function */
bsnes-0.079-gcc46.patch:
snes/chip/icd2/interface/interface.cpp | 2 +-
ui/input/input.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE bsnes-0.079-gcc46.patch ---
diff -up bsnes_v079-source/bsnes/snes/chip/icd2/interface/interface.cpp.gcc46 bsnes_v079-source/bsnes/snes/chip/icd2/interface/interface.cpp
--- bsnes_v079-source/bsnes/snes/chip/icd2/interface/interface.cpp.gcc46 2011-05-08 13:14:20.000000000 +0200
+++ bsnes_v079-source/bsnes/snes/chip/icd2/interface/interface.cpp 2011-06-21 00:02:22.972853738 +0200
@@ -101,7 +101,7 @@ bool ICD2::input_poll(unsigned id) {
case 3: data = ~r6007; break;
}
- switch(id) {
+ switch((GameBoy::Input)id) {
case GameBoy::Input::Start: return data & 0x80;
case GameBoy::Input::Select: return data & 0x40;
case GameBoy::Input::B: return data & 0x20;
diff -up bsnes_v079-source/bsnes/ui/input/input.cpp.gcc46 bsnes_v079-source/bsnes/ui/input/input.cpp
--- bsnes_v079-source/bsnes/ui/input/input.cpp.gcc46 2011-03-24 19:33:58.000000000 +0100
+++ bsnes_v079-source/bsnes/ui/input/input.cpp 2011-06-21 00:02:22.971853731 +0200
@@ -82,7 +82,7 @@ void InputMapper::Gamepad::create(const
}
int16_t InputMapper::Gamepad::poll(unsigned id) {
- switch(id) {
+ switch((SNES::Input::JoypadID)id) {
case SNES::Input::JoypadID::Up: return up.poll();
case SNES::Input::JoypadID::Down: return down.poll() & !up.poll();
case SNES::Input::JoypadID::Left: return left.poll();
@@ -118,7 +118,7 @@ void InputMapper::Mouse::create(const ch
}
int16_t InputMapper::Mouse::poll(unsigned id) {
- switch(id) {
+ switch((SNES::Input::MouseID)id) {
case SNES::Input::MouseID::X: return x.poll();
case SNES::Input::MouseID::Y: return y.poll();
case SNES::Input::MouseID::Left: return left.poll();
@@ -150,7 +150,7 @@ void InputMapper::SuperScope::create(con
}
int16_t InputMapper::SuperScope::poll(unsigned id) {
- switch(id) {
+ switch((SNES::Input::SuperScopeID)id) {
case SNES::Input::SuperScopeID::X: return x.poll();
case SNES::Input::SuperScopeID::Y: return y.poll();
case SNES::Input::SuperScopeID::Trigger: return trigger.poll();
@@ -182,7 +182,7 @@ void InputMapper::Justifier::create(cons
}
int16_t InputMapper::Justifier::poll(unsigned id) {
- switch(id) {
+ switch((SNES::Input::JustifierID)id) {
case SNES::Input::JustifierID::X: return x.poll();
case SNES::Input::JustifierID::Y: return y.poll();
case SNES::Input::JustifierID::Trigger: return trigger.poll();
bsnes-0.079-nocheats.patch:
Makefile | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE bsnes-0.079-nocheats.patch ---
diff -up bsnes_v079-source/bsnes/ui/Makefile.nocheats bsnes_v079-source/bsnes/ui/Makefile
--- bsnes_v079-source/bsnes/ui/Makefile.nocheats 2011-03-15 00:58:22.000000000 +0100
+++ bsnes_v079-source/bsnes/ui/Makefile 2011-06-08 00:09:34.125573793 +0200
@@ -96,9 +96,6 @@ ifeq ($(platform),x)
endif
install -D -m 644 data/bsnes.png $(DESTDIR)$(prefix)/share/pixmaps/bsnes.png
install -D -m 644 data/bsnes.desktop $(DESTDIR)$(prefix)/share/applications/bsnes.desktop
- mkdir -p ~/.config/bsnes
- cp data/cheats.xml ~/.config/bsnes/cheats.xml
- chmod 777 ~/.config/bsnes ~/.config/bsnes/cheats.xml
uninstall:
ifeq ($(platform),x)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 21 Nov 2010 19:41:21 -0000 1.29
+++ .cvsignore 20 Jun 2011 22:50:43 -0000 1.30
@@ -1 +1 @@
-bsnes_v072.tar.bz2
+bsnes_v079-source.tar.bz2
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- bsnes.spec 21 Nov 2010 19:41:21 -0000 1.40
+++ bsnes.spec 20 Jun 2011 22:50:44 -0000 1.41
@@ -1,4 +1,4 @@
-%global vernumber 072
+%global vernumber 079
Name: bsnes
Version: 0.%{vernumber}
@@ -8,12 +8,11 @@
Group: Applications/Emulators
License: GPLv2
URL: http://byuu.org/bsnes/
-Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}.tar.bz2
+Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}-source.tar.bz2
Source2: README.bsnes
-Patch0: bsnes-0.072-nocheats.patch
-Patch1: bsnes-0.068-newppcelf.patch
-Patch2: bsnes-0.068-noppcelfppc64.patch
-Patch3: bsnes-0.064-systemlibs.patch
+Patch0: bsnes-0.079-gcc46.patch
+Patch1: bsnes-0.079-crashfix.patch
+Patch2: bsnes-0.079-nocheats.
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#bsnes does not use system snes_ntsc because the modified video processing
@@ -28,6 +27,9 @@
BuildRequires: qt-devel
Obsoletes: %{name}-pixelshaders < 0.064
+Obsoletes: %{name}-snesfilter < 0.079
+Obsoletes: %{name}-snesreader < 0.079
+Obsoletes: %{name}-supergameboy < 0.079
%description
bsnes is an emulator that began development on 2004-10-14. The purpose of the
@@ -37,77 +39,45 @@
includes speed and game-specific hacks for compatibility. As a result, the
minimum system requirements for bsnes are quite high.
-%package snesfilter
-Summary: Visual filters for %{name}
-Group: Applications/Emulators
-Requires: %{name} = %{version}-%{release}
-
-%description snesfilter
-This subpackage contains various video filters for bsnes.
-
-%package snesreader
-Summary: Compressed ROM images support for %{name}
-Group: Applications/Emulators
-Requires: %{name} = %{version}-%{release}
-
-%description snesreader
-This subpackage enables support for various compressed images, like .zip, .7z,
-.rar and others.
-
-%package supergameboy
-Summary: Super Game Boy emulation for %{name}
-Group: Applications/Emulators
-Requires: %{name} = %{version}-%{release}
-
-%description supergameboy
-This package includes gambatte-based Super Game Boy emulation.
-
%prep
-%setup -qc
-%patch0 -p1 -b .nocheats
-%patch1 -p1 -b .newppcelf
-%patch2 -p1 -b .noppcelfppc64
-%patch3 -p1 -b .systemlibs
+%setup -q -n %{name}_v%{vernumber}-source
+%patch0 -p1 -b .gcc46
+%patch1 -p1 -b .crashfix
+%patch2 -p1 -b .nocheats
+
#fix permissions
find . -type f -not -name \*.sh -exec chmod 644 {} \;
#use system optflags
-for sourcedir in snesfilter snesreader bsnes supergameboy
-do
- pushd $sourcedir
- sed -i "s#-O3#$RPM_OPT_FLAGS#" Makefile
- popd
-done
+sed -i "s/-O3/$RPM_OPT_FLAGS/" bsnes/Makefile
+sed -i "s/-O3/$RPM_OPT_FLAGS -fPIC/" snesfilter/Makefile
+sed -i "s/-O3/$RPM_OPT_FLAGS/" snespurify/cc-qt.sh
#don't strip the binaries prematurely
-for sourcedir in snesfilter snesreader bsnes supergameboy
-do
- pushd $sourcedir
- sed -i "s/link += -s/link +=/" Makefile
- popd
-done
+sed -i "s/link += -s/link +=/" bsnes/Makefile
+sed -i "s/link := -s/link :=/" snesfilter/Makefile
+sed -i "s/-s //" snespurify/cc-qt.sh
+
+#use the proper compiler and moc commands
+sed -i "s/g++-4.5/g++/" snespurify/cc-qt.sh
+sed -i "s/moc/moc-qt4/" snespurify/cc-qt.sh
#install fedora-specific readme
install -pm 644 %{SOURCE2} README.Fedora
-#pulseaudio on fedora 11 is too old
-%if 0%{?fedora} < 12
-sed -i "s(a)audio.pulseaudio @@" bsnes/ui_qt/Makefile
-%endif
-
%build
-for sourcedir in snesfilter snesreader supergameboy
-do
- pushd $sourcedir
- make %{?_smp_mflags} moc=moc-qt4 compiler=gcc
- popd
-done
-
pushd bsnes
-make %{?_smp_mflags} platform=x compiler=gcc moc=moc-qt4 profile=compatibility ui=ui-qt
+make %{?_smp_mflags} compiler=gcc
+popd
+pushd snesfilter
+make %{?_smp_mflags} compiler=gcc
+popd
+pushd snespurify
+./cc-qt.sh
+popd
%install
@@ -118,61 +88,36 @@
--delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/bsnes.desktop
popd
-install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-for sourcedir in snesfilter snesreader supergameboy
-do
- pushd $sourcedir
- install -pm 755 lib$sourcedir.so $RPM_BUILD_ROOT%{_libdir}/lib$sourcedir.so
- popd
-done
-
+install -pm 644 bsnes/data/cheats.xml $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d $RPM_BUILD_ROOT%{_libexecdir}/%{name}/filters
+install -pm 755 snesfilter/out/*.filter $RPM_BUILD_ROOT%{_libexecdir}/%{name}/filters
+install -pm 755 snespurify/snespurify-qt $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
+install -pm 644 snesshader/*.shader $RPM_BUILD_ROOT%{_datadir}/%{name}/shaders
%clean
rm -rf $RPM_BUILD_ROOT
-%post snesfilter -p /sbin/ldconfig
-
-
-%postun snesfilter -p /sbin/ldconfig
-
-
-%if %{with snesreader}
-%post snesreader -p /sbin/ldconfig
-
-
-%postun snesreader -p /sbin/ldconfig
-%endif
-
-
-%post supergameboy -p /sbin/ldconfig
-
-
-%postun supergameboy -p /sbin/ldconfig
-
-
%files
%defattr(-,root,root,-)
-%doc README.Fedora bsnes/ui-qt/data/*.html
+%doc README.Fedora
%{_bindir}/bsnes
+%{_bindir}/snespurify-qt
+%{_libexecdir}/bsnes
+%{_datadir}/bsnes
%{_datadir}/pixmaps/bsnes.png
%{_datadir}/applications/rpmfusion-bsnes.desktop
-%files snesfilter
-%defattr(-,root,root,-)
-%{_libdir}/libsnesfilter.so
-
-%files snesreader
-%defattr(-,root,root,-)
-%{_libdir}/libsnesreader.so
-
-%files supergameboy
-%defattr(-,root,root,-)
-%{_libdir}/libsupergameboy.so
-
%changelog
+* Tue Jun 21 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.079-1
+- Updated to 0.079
+- Dropped subpackages, they are too small to be worth it
+- Updated the Fedora readme
+- Added patches by Themaister
+
* Sun Nov 21 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.072-1
- Updated to 0.072
- Dropped gconf patch, added cheats one
Index: sources
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 21 Nov 2010 19:41:21 -0000 1.29
+++ sources 20 Jun 2011 22:50:44 -0000 1.30
@@ -1 +1 @@
-dcbd0f2a88682fb25d409a8276576983 bsnes_v072.tar.bz2
+22513f713e29824a85a0fe193298f9f2 bsnes_v079-source.tar.bz2
--- bsnes-0.064-systemlibs.patch DELETED ---
--- bsnes-0.068-newppcelf.patch DELETED ---
--- bsnes-0.068-noppcelfppc64.patch DELETED ---
12 years, 10 months
rpms/mame/F-13 .cvsignore, 1.28, 1.29 mame.spec, 1.31, 1.32 sources, 1.28, 1.29
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25670
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Sun Jun 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u6-1
- Updated to 0.142u6
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 6 Jun 2011 18:01:57 -0000 1.28
+++ .cvsignore 19 Jun 2011 20:30:48 -0000 1.29
@@ -4,3 +4,4 @@
0142u3_diff.zip
0142u4_diff.zip
0142u5_diff.zip
+0142u6_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/mame.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mame.spec 6 Jun 2011 18:01:57 -0000 1.31
+++ mame.spec 19 Jun 2011 20:30:48 -0000 1.32
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 142
-%global sourceupdate 5
+%global sourceupdate 6
Name: mame
%if 0%{?sourceupdate}
@@ -28,6 +28,7 @@
Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
+Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -250,6 +251,9 @@
%changelog
+* Sun Jun 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u6-1
+- Updated to 0.142u6
+
* Mon Jun 06 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u5-1
- Updated to 0.142u5
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 6 Jun 2011 18:01:57 -0000 1.28
+++ sources 19 Jun 2011 20:30:48 -0000 1.29
@@ -4,3 +4,4 @@
ee85ed741530e1d673d5a758650e86d0 0142u3_diff.zip
2a21cd4db0632cb86d9c60ed29ea0388 0142u4_diff.zip
105f1487a389073ca0bd765ff03424f0 0142u5_diff.zip
+9cb9f72aa1dc65024768df50a22a6e23 0142u6_diff.zip
12 years, 10 months
rpms/mame/F-14 .cvsignore, 1.29, 1.30 mame.spec, 1.35, 1.36 sources, 1.29, 1.30
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25568
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Sun Jun 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u6-1
- Updated to 0.142u6
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 6 Jun 2011 18:01:45 -0000 1.29
+++ .cvsignore 19 Jun 2011 20:30:41 -0000 1.30
@@ -4,3 +4,4 @@
0142u3_diff.zip
0142u4_diff.zip
0142u5_diff.zip
+0142u6_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/mame.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mame.spec 6 Jun 2011 18:01:45 -0000 1.35
+++ mame.spec 19 Jun 2011 20:30:41 -0000 1.36
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 142
-%global sourceupdate 5
+%global sourceupdate 6
Name: mame
%if 0%{?sourceupdate}
@@ -28,6 +28,7 @@
Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
+Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -250,6 +251,9 @@
%changelog
+* Sun Jun 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u6-1
+- Updated to 0.142u6
+
* Mon Jun 06 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u5-1
- Updated to 0.142u5
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-14/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 6 Jun 2011 18:01:46 -0000 1.29
+++ sources 19 Jun 2011 20:30:41 -0000 1.30
@@ -4,3 +4,4 @@
ee85ed741530e1d673d5a758650e86d0 0142u3_diff.zip
2a21cd4db0632cb86d9c60ed29ea0388 0142u4_diff.zip
105f1487a389073ca0bd765ff03424f0 0142u5_diff.zip
+9cb9f72aa1dc65024768df50a22a6e23 0142u6_diff.zip
12 years, 10 months
rpms/mame/F-15 .cvsignore, 1.29, 1.30 mame.spec, 1.35, 1.36 sources, 1.29, 1.30
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25466
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Sun Jun 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u6-1
- Updated to 0.142u6
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 6 Jun 2011 18:01:32 -0000 1.29
+++ .cvsignore 19 Jun 2011 20:30:31 -0000 1.30
@@ -4,3 +4,4 @@
0142u3_diff.zip
0142u4_diff.zip
0142u5_diff.zip
+0142u6_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/mame.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mame.spec 6 Jun 2011 18:01:32 -0000 1.35
+++ mame.spec 19 Jun 2011 20:30:31 -0000 1.36
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 142
-%global sourceupdate 5
+%global sourceupdate 6
Name: mame
%if 0%{?sourceupdate}
@@ -28,6 +28,7 @@
Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
+Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -250,6 +251,9 @@
%changelog
+* Sun Jun 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u6-1
+- Updated to 0.142u6
+
* Mon Jun 06 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u5-1
- Updated to 0.142u5
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 6 Jun 2011 18:01:32 -0000 1.29
+++ sources 19 Jun 2011 20:30:31 -0000 1.30
@@ -4,3 +4,4 @@
ee85ed741530e1d673d5a758650e86d0 0142u3_diff.zip
2a21cd4db0632cb86d9c60ed29ea0388 0142u4_diff.zip
105f1487a389073ca0bd765ff03424f0 0142u5_diff.zip
+9cb9f72aa1dc65024768df50a22a6e23 0142u6_diff.zip
12 years, 10 months
rpms/mame/devel .cvsignore, 1.29, 1.30 mame.spec, 1.35, 1.36 sources, 1.29, 1.30
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25358
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Sun Jun 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u6-1
- Updated to 0.142u6
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 6 Jun 2011 18:01:21 -0000 1.29
+++ .cvsignore 19 Jun 2011 20:30:22 -0000 1.30
@@ -4,3 +4,4 @@
0142u3_diff.zip
0142u4_diff.zip
0142u5_diff.zip
+0142u6_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mame.spec 6 Jun 2011 18:01:21 -0000 1.35
+++ mame.spec 19 Jun 2011 20:30:22 -0000 1.36
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 142
-%global sourceupdate 5
+%global sourceupdate 6
Name: mame
%if 0%{?sourceupdate}
@@ -28,6 +28,7 @@
Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
Source5: http://mamedev.org/updates/0%{baseversion}u5_diff.zip
+Source6: http://mamedev.org/updates/0%{baseversion}u6_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -250,6 +251,9 @@
%changelog
+* Sun Jun 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u6-1
+- Updated to 0.142u6
+
* Mon Jun 06 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u5-1
- Updated to 0.142u5
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 6 Jun 2011 18:01:21 -0000 1.29
+++ sources 19 Jun 2011 20:30:22 -0000 1.30
@@ -4,3 +4,4 @@
ee85ed741530e1d673d5a758650e86d0 0142u3_diff.zip
2a21cd4db0632cb86d9c60ed29ea0388 0142u4_diff.zip
105f1487a389073ca0bd765ff03424f0 0142u5_diff.zip
+9cb9f72aa1dc65024768df50a22a6e23 0142u6_diff.zip
12 years, 10 months
rpms/xorg-x11-drv-catalyst/F-14 .cvsignore, 1.6, 1.7 catalyst.csh, 1.1, 1.2 catalyst.sh, 1.1, 1.2 sources, 1.5, 1.6 xorg-x11-drv-catalyst.spec, 1.6, 1.7
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20896
Modified Files:
.cvsignore catalyst.csh catalyst.sh sources
xorg-x11-drv-catalyst.spec
Log Message:
* Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1
* Update to Catalyst 11.6 (internal version 8.86.1)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 2 May 2011 07:45:27 -0000 1.6
+++ .cvsignore 18 Jun 2011 21:30:42 -0000 1.7
@@ -1 +1 @@
-ati-driver-installer-11-4-x86.x86_64.run
+ati-driver-installer-11-6-x86.x86_64.run
Index: catalyst.csh
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/catalyst.csh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalyst.csh 6 May 2009 20:01:21 -0000 1.1
+++ catalyst.csh 18 Jun 2011 21:30:42 -0000 1.2
@@ -1,9 +1,9 @@
set arch = `uname -m`
if ($arch == x86_64) then
- setenv LIBGL_DRIVERS_PATH /usr/lib64/dri:/usr/lib/dri
- #setenv LD_LIBRARY_PATH /usr/lib64/fglrx:/usr/lib/fglrx:$LD_LIBRARY_PATH
+ setenv LIBGL_DRIVERS_PATH /usr/lib64/dri:/usr/lib/dri:$LIBGL_DRIVERS_PATH
+ setenv LD_LIBRARY_PATH /usr/lib64/catalyst:/usr/lib/catalyst:$LD_LIBRARY_PATH
else if ($arch =~ i[3-6]86) then
- setenv LIBGL_DRIVERS_PATH /usr/lib/dri
- #setenv LD_LIBRARY_PATH /usr/lib/fglrx:$LD_LIBRARY_PATH
+ setenv LIBGL_DRIVERS_PATH /usr/lib/dri:$LIBGL_DRIVERS_PATH
+ setenv LD_LIBRARY_PATH /usr/lib/catalyst:$LD_LIBRARY_PATH
endif
Index: catalyst.sh
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/catalyst.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalyst.sh 6 May 2009 20:01:21 -0000 1.1
+++ catalyst.sh 18 Jun 2011 21:30:42 -0000 1.2
@@ -1,8 +1,9 @@
ARCH="$(uname -m)"
case "$ARCH" in
- x86_64) export LIBGL_DRIVERS_PATH="/usr/lib64/dri:/usr/lib/dri";;
- #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib64/fglrx:/usr/lib/fglrx";;
- i[3-6\d]86) export LIBGL_DRIVERS_PATH="/usr/lib/dri";;
- #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/fglrx";;
+ x86_64) export LIBGL_DRIVERS_PATH="/usr/lib64/dri:/usr/lib/dri:$LIBGL_DRIVERS_PATH";
+ export LD_LIBRARY_PATH="/usr/lib64/fglrx:/usr/lib/catalyst:$LD_LIBRARY_PATH";;
+ i[3-6\d]86) export LIBGL_DRIVERS_PATH="/usr/lib/dri:$LIBGL_DRIVERS_PATH";
+ export LD_LIBRARY_PATH="/usr/lib/catalyst:$LD_LIBRARY_PATH";;
esac
+
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 2 May 2011 07:45:27 -0000 1.5
+++ sources 18 Jun 2011 21:30:42 -0000 1.6
@@ -1 +1 @@
-b50dc05ef3428a9ee632b09eebeb4586 ati-driver-installer-11-4-x86.x86_64.run
+ff901cfa828006e25e9d6718a515b5c0 ati-driver-installer-11-6-x86.x86_64.run
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-catalyst.spec 2 May 2011 07:50:42 -0000 1.6
+++ xorg-x11-drv-catalyst.spec 18 Jun 2011 21:30:42 -0000 1.7
@@ -7,13 +7,13 @@
%endif
Name: xorg-x11-drv-catalyst
-Version: 11.4
+Version: 11.6
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: catalyst-README.Fedora
Source3: catalyst-config-display
Source4: catalyst-init
@@ -154,6 +154,9 @@
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/dri}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_prefix}/%{_lib}/dri/${file##./usr/X11R6/%{_lib}/modules/dri}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/${file##./usr/X11R6/%{_lib}/modules/extensions}
@@ -168,9 +171,15 @@
elif [[ ! "/${file##./usr/X11R6/include/X11/extensions}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/fglrx/X11/extensions/${file##./usr/X11R6/include/X11/extensions}
+ elif [[ ! "/${file##./usr/%{_lib}/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/fglrx}
elif [[ ! "/${file##./usr/%{_lib}}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/fglrx}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/}
@@ -208,9 +217,13 @@
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{atilibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
+# Remove the fglrx prefix on some of the new library filenames
+mv $RPM_BUILD_ROOT/%{atilibdir}/{fglrx-,}libGL.so.1.2
+mv $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/{fglrx-,}libglx.so
+
# if we want versioned libs, then we need to change this and the loop above
# to install the libs as soname.so.%{version}
-ln -s fglrx-libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/fglrx-libGL.so.1
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/libGL.so.1
ln -s libfglrx_gamma.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_gamma.so.1
ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_dm.so.1
ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libAMDXvBA.so.1
@@ -320,7 +333,8 @@
%defattr(-,root,root,-)
%dir %{atilibdir}
%{atilibdir}/*.so*
-%{atilibdir}/fglrx/*libGL*.so*
+%{atilibdir}/switchlibGL
+%{atilibdir}/switchlibglx
%{atilibdir}/libAMDXvBA.cap
%{_libdir}/dri/
@@ -332,6 +346,9 @@
%{_includedir}/fglrx/
%changelog
+* Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1
+* Update to Catalyst 11.6 (internal version 8.86.1)
+
* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11.4-1
- Update to Catalyst 11.4 (internal version 8.84.1)
12 years, 10 months
rpms/xorg-x11-drv-catalyst/F-15 .cvsignore, 1.4, 1.5 catalyst.csh, 1.1, 1.2 catalyst.sh, 1.1, 1.2 sources, 1.3, 1.4 xorg-x11-drv-catalyst.spec, 1.3, 1.4
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12015/F-15
Modified Files:
.cvsignore catalyst.csh catalyst.sh sources
xorg-x11-drv-catalyst.spec
Log Message:
* Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1
* Update to Catalyst 11.6 (internal version 8.86.1)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2 May 2011 07:46:01 -0000 1.4
+++ .cvsignore 18 Jun 2011 20:24:21 -0000 1.5
@@ -1 +1 @@
-ati-driver-installer-11-4-x86.x86_64.run
+ati-driver-installer-11-6-x86.x86_64.run
Index: catalyst.csh
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/catalyst.csh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalyst.csh 6 May 2009 20:01:21 -0000 1.1
+++ catalyst.csh 18 Jun 2011 20:24:21 -0000 1.2
@@ -1,9 +1,9 @@
set arch = `uname -m`
if ($arch == x86_64) then
- setenv LIBGL_DRIVERS_PATH /usr/lib64/dri:/usr/lib/dri
- #setenv LD_LIBRARY_PATH /usr/lib64/fglrx:/usr/lib/fglrx:$LD_LIBRARY_PATH
+ setenv LIBGL_DRIVERS_PATH /usr/lib64/dri:/usr/lib/dri:$LIBGL_DRIVERS_PATH
+ setenv LD_LIBRARY_PATH /usr/lib64/catalyst:/usr/lib/catalyst:$LD_LIBRARY_PATH
else if ($arch =~ i[3-6]86) then
- setenv LIBGL_DRIVERS_PATH /usr/lib/dri
- #setenv LD_LIBRARY_PATH /usr/lib/fglrx:$LD_LIBRARY_PATH
+ setenv LIBGL_DRIVERS_PATH /usr/lib/dri:$LIBGL_DRIVERS_PATH
+ setenv LD_LIBRARY_PATH /usr/lib/catalyst:$LD_LIBRARY_PATH
endif
Index: catalyst.sh
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/catalyst.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalyst.sh 6 May 2009 20:01:21 -0000 1.1
+++ catalyst.sh 18 Jun 2011 20:24:22 -0000 1.2
@@ -1,8 +1,9 @@
ARCH="$(uname -m)"
case "$ARCH" in
- x86_64) export LIBGL_DRIVERS_PATH="/usr/lib64/dri:/usr/lib/dri";;
- #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib64/fglrx:/usr/lib/fglrx";;
- i[3-6\d]86) export LIBGL_DRIVERS_PATH="/usr/lib/dri";;
- #export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/fglrx";;
+ x86_64) export LIBGL_DRIVERS_PATH="/usr/lib64/dri:/usr/lib/dri:$LIBGL_DRIVERS_PATH";
+ export LD_LIBRARY_PATH="/usr/lib64/fglrx:/usr/lib/catalyst:$LD_LIBRARY_PATH";;
+ i[3-6\d]86) export LIBGL_DRIVERS_PATH="/usr/lib/dri:$LIBGL_DRIVERS_PATH";
+ export LD_LIBRARY_PATH="/usr/lib/catalyst:$LD_LIBRARY_PATH";;
esac
+
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 2 May 2011 07:46:01 -0000 1.3
+++ sources 18 Jun 2011 20:24:22 -0000 1.4
@@ -1 +1 @@
-b50dc05ef3428a9ee632b09eebeb4586 ati-driver-installer-11-4-x86.x86_64.run
+ff901cfa828006e25e9d6718a515b5c0 ati-driver-installer-11-6-x86.x86_64.run
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-catalyst.spec 2 May 2011 07:50:41 -0000 1.3
+++ xorg-x11-drv-catalyst.spec 18 Jun 2011 20:24:22 -0000 1.4
@@ -7,13 +7,13 @@
%endif
Name: xorg-x11-drv-catalyst
-Version: 11.4
+Version: 11.6
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: catalyst-README.Fedora
Source3: catalyst-config-display
Source4: catalyst-init
@@ -154,6 +154,9 @@
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/dri}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_prefix}/%{_lib}/dri/${file##./usr/X11R6/%{_lib}/modules/dri}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/${file##./usr/X11R6/%{_lib}/modules/extensions}
@@ -168,9 +171,15 @@
elif [[ ! "/${file##./usr/X11R6/include/X11/extensions}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/fglrx/X11/extensions/${file##./usr/X11R6/include/X11/extensions}
+ elif [[ ! "/${file##./usr/%{_lib}/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/fglrx}
elif [[ ! "/${file##./usr/%{_lib}}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/fglrx}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/}
@@ -208,9 +217,13 @@
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{atilibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
+# Remove the fglrx prefix on some of the new library filenames
+mv $RPM_BUILD_ROOT/%{atilibdir}/{fglrx-,}libGL.so.1.2
+mv $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/{fglrx-,}libglx.so
+
# if we want versioned libs, then we need to change this and the loop above
# to install the libs as soname.so.%{version}
-ln -s fglrx-libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/fglrx-libGL.so.1
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/libGL.so.1
ln -s libfglrx_gamma.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_gamma.so.1
ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_dm.so.1
ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libAMDXvBA.so.1
@@ -320,7 +333,8 @@
%defattr(-,root,root,-)
%dir %{atilibdir}
%{atilibdir}/*.so*
-%{atilibdir}/fglrx/*libGL*.so*
+%{atilibdir}/switchlibGL
+%{atilibdir}/switchlibglx
%{atilibdir}/libAMDXvBA.cap
%{_libdir}/dri/
@@ -331,8 +345,10 @@
#%{_libdir}/xorg/modules/*.a
%{_includedir}/fglrx/
-
%changelog
+* Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1
+* Update to Catalyst 11.6 (internal version 8.86.1)
+
* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11.4-1
- Update to Catalyst 11.4 (internal version 8.84.1)
- Port changes from F-14 branch
12 years, 10 months
rpms/catalyst-kmod/F-14 catalyst-kmod.spec,1.15,1.16
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/catalyst-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10607/F-14
Modified Files:
catalyst-kmod.spec
Log Message:
Re-enable build for newest
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-14/catalyst-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- catalyst-kmod.spec 18 Jun 2011 20:05:55 -0000 1.15
+++ catalyst-kmod.spec 18 Jun 2011 20:06:50 -0000 1.16
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
12 years, 10 months