rpms/avidemux/F-16 avidemux.spec,1.57,1.58
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1686
Modified Files:
avidemux.spec
Log Message:
* Wed Feb 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-4
- Rebuild for libvpx soname bump.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-16/avidemux.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- avidemux.spec 28 Jan 2012 17:23:41 -0000 1.57
+++ avidemux.spec 2 Feb 2012 01:42:15 -0000 1.58
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -307,6 +307,9 @@
%changelog
+* Wed Feb 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-4
+- Rebuild for libvpx soname bump.
+
* Sat Jan 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-3
- Install icon files to preferred location.
- Reenable FFmpeg based AAC encoding.
12 years, 2 months
rpms/avidemux/devel avidemux.spec,1.61,1.62
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1550
Modified Files:
avidemux.spec
Log Message:
* Wed Feb 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-4
- Rebuild for libvpx soname bump.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- avidemux.spec 28 Jan 2012 17:12:14 -0000 1.61
+++ avidemux.spec 2 Feb 2012 01:41:16 -0000 1.62
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -307,6 +307,9 @@
%changelog
+* Wed Feb 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-4
+- Rebuild for libvpx soname bump.
+
* Sat Jan 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-3
- Install icon files to preferred location.
- Reenable FFmpeg based AAC encoding.
12 years, 2 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.92,1.93
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3397
Modified Files:
nvidia-kmod.spec
Log Message:
Build for akmod
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- nvidia-kmod.spec 1 Feb 2012 22:46:09 -0000 1.92
+++ nvidia-kmod.spec 1 Feb 2012 22:46:58 -0000 1.93
@@ -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 akmod
Name: nvidia-kmod
Epoch: 1
12 years, 2 months
rpms/nvidia-kmod/devel .cvsignore, 1.40, 1.41 nvidia-kmod.spec, 1.91, 1.92 sources, 1.40, 1.41
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2962/devel
Modified Files:
.cvsignore nvidia-kmod.spec sources
Log Message:
Update to 295.17
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 1 Jan 2012 12:23:16 -0000 1.40
+++ .cvsignore 1 Feb 2012 22:46:09 -0000 1.41
@@ -1 +1 @@
-nvidia-kmod-data-295.09.tar.bz2
+nvidia-kmod-data-295.17.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- nvidia-kmod.spec 1 Jan 2012 12:23:16 -0000 1.91
+++ nvidia-kmod.spec 1 Feb 2012 22:46:09 -0000 1.92
@@ -3,11 +3,11 @@
# "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 akmod
+#define buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 295.09
+Version: 295.17
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -19,7 +19,7 @@
#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
# <switch me> when sources are on kwizart's repo
-Source0: http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.bz2
+Source0: http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.xz
#Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers...
# </switch me>
@@ -51,7 +51,7 @@
%ifarch %{ix86}
cp -a nvidiapkg-x86 _kmod_build_${kernel_version%%___*}
%else
- cp -a nvidiapkg-x86_64 _kmod_build_${kernel_version%%___*}
+ cp -a nvidiapkg-x64 _kmod_build_${kernel_version%%___*}
%endif
done
@@ -77,6 +77,9 @@
%changelog
+* Wed Feb 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.17-1
+- Update to 295.17 (beta)
+
* Sat Dec 31 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.09-1
- Update to 295.09 (beta)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 1 Jan 2012 12:23:16 -0000 1.40
+++ sources 1 Feb 2012 22:46:09 -0000 1.41
@@ -1 +1 @@
-14e4f9b1456b1d142b551ee0c05a6951 nvidia-kmod-data-295.09.tar.bz2
+9ffcd37a355a8bbcc72ddd14375c0c2b nvidia-kmod-data-295.17.tar.xz
12 years, 2 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.40, 1.41 sources, 1.40, 1.41 xorg-x11-drv-nvidia.spec, 1.72, 1.73
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1111/devel
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to latest beta
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 1 Jan 2012 12:17:01 -0000 1.40
+++ .cvsignore 1 Feb 2012 22:37:17 -0000 1.41
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-295.09.run
-NVIDIA-Linux-x86_64-295.09.run
+NVIDIA-Linux-x86_64-295.17.run
+NVIDIA-Linux-x86-295.17.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 1 Jan 2012 12:17:01 -0000 1.40
+++ sources 1 Feb 2012 22:37:17 -0000 1.41
@@ -1,2 +1,2 @@
-cd0a20afd4d891adb884b9ad054fa2b6 NVIDIA-Linux-x86-295.09.run
-f9829d18aba6765336aed2aa02b92fe0 NVIDIA-Linux-x86_64-295.09.run
+c69043648b0d988565b6f4c223784089 NVIDIA-Linux-x86_64-295.17.run
+453d7585254cb2abb486135828278e43 NVIDIA-Linux-x86-295.17.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- xorg-x11-drv-nvidia.spec 1 Jan 2012 12:17:01 -0000 1.72
+++ xorg-x11-drv-nvidia.spec 1 Feb 2012 22:37:17 -0000 1.73
@@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 295.09
+Version: 295.17
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -138,7 +138,7 @@
%setup -q -c -T
sh %{SOURCE0} --extract-only --target nvidiapkg-x86
sh %{SOURCE1} --extract-only --target nvidiapkg-x64
-tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel
+tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
%ifarch %{ix86}
ln -s nvidiapkg-x86 nvidiapkg
@@ -255,14 +255,16 @@
%post
if [ "$1" -eq "1" ]; then
- # Enable nvidia driver when installing
- #%{_sbindir}/nvidia-config-display enable &>/dev/null ||:
- # Add init script and start it
- #/sbin/chkconfig --add nvidia ||:
- #/etc/init.d/nvidia start &>/dev/null ||:
+ ISGRUB1=""
+ if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then
+ ISGRUB1="--grub"
+ fi
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' &>/dev/null
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${GRUBBYLASTKERNEL} \
+ --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' \
+ &>/dev/null
fi
fi || :
@@ -274,21 +276,21 @@
%preun
if [ "$1" -eq "0" ]; then
- # Disable driver on final removal
- #test -f %{_sbindir}/nvidia-config-display && %{_sbindir}/nvidia-config-display disable &>/dev/null
- #%{_initrddir}/nvidia stop &>/dev/null
- #/sbin/chkconfig --del nvidia &>/dev/null
- #Clear grub option to disable nouveau for all kernels
- if [ -x /sbin/grubby ] ; then
- KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
- for kernel in ${KERNELS} ; do
- /sbin/grubby --update-kernel=${kernel} \
+ ISGRUB1=""
+ if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub2.cfg ]] ; then
+ ISGRUB1="--grub"
+ fi
+ if [ -x /sbin/grubby ] ; then
+ KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${kernel} \
--remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset' &>/dev/null
- done
- fi
- #Backup and disable previously used xorg.conf
- [ -f %{_sysconfdir}/X11/xorg.conf ] && \
- mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null
+ done
+ fi
+ #Backup and disable previously used xorg.conf
+ [ -f %{_sysconfdir}/X11/xorg.conf ] && \
+ mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null
fi ||:
%postun libs -p /sbin/ldconfig
@@ -347,6 +349,11 @@
%changelog
+* Wed Feb 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.17-1
+- Update to 295.17 (beta)
+- Fix kernel options when using grub legacy.
+- Change nvidia-kmod-data archive to xz compression
+
* Sat Dec 31 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.09-1
- Update to 295.09 (beta)
- Remove libcuda.so.1 filter - rfbz#2083
12 years, 2 months
rpms/vagalume/F-16 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 vagalume.spec, 1.13, 1.14
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/vagalume/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31007/F-16
Modified Files:
.cvsignore sources vagalume.spec
Log Message:
* Wed Feb 1 2012 Michel Salim <salimma(a)fedoraproject.org> - 0.8.5-1
- Update to 0.8.5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-16/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 7 Feb 2011 18:17:44 -0000 1.6
+++ .cvsignore 1 Feb 2012 22:27:29 -0000 1.7
@@ -1 +1 @@
-vagalume-0.8.4.tar.gz
+vagalume-0.8.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-16/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 7 Feb 2011 18:17:44 -0000 1.6
+++ sources 1 Feb 2012 22:27:29 -0000 1.7
@@ -1 +1 @@
-460b229626c55043bd8c00e1af3968b7 vagalume-0.8.4.tar.gz
+fba804c44ecb441bca92f499be9377e1 vagalume-0.8.5.tar.gz
Index: vagalume.spec
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-16/vagalume.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vagalume.spec 7 Feb 2011 18:37:55 -0000 1.13
+++ vagalume.spec 1 Feb 2012 22:27:29 -0000 1.14
@@ -1,5 +1,5 @@
Name: vagalume
-Version: 0.8.4
+Version: 0.8.5
Release: 1%{?dist}
Summary: Last.fm client for GNOME and Maemo
@@ -101,6 +101,9 @@
%changelog
+* Wed Feb 1 2012 Michel Salim <salimma(a)fedoraproject.org> - 0.8.5-1
+- Update to 0.8.5
+
* Mon Feb 7 2011 Michel Salim <salimma(a)fedoraproject.org> - 0.8.4-1
- Update to 0.8.4
12 years, 2 months
rpms/vagalume/F-15 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 vagalume.spec, 1.13, 1.14
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/vagalume/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31007/F-15
Modified Files:
.cvsignore sources vagalume.spec
Log Message:
* Wed Feb 1 2012 Michel Salim <salimma(a)fedoraproject.org> - 0.8.5-1
- Update to 0.8.5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-15/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 7 Feb 2011 18:17:44 -0000 1.6
+++ .cvsignore 1 Feb 2012 22:27:29 -0000 1.7
@@ -1 +1 @@
-vagalume-0.8.4.tar.gz
+vagalume-0.8.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-15/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 7 Feb 2011 18:17:44 -0000 1.6
+++ sources 1 Feb 2012 22:27:29 -0000 1.7
@@ -1 +1 @@
-460b229626c55043bd8c00e1af3968b7 vagalume-0.8.4.tar.gz
+fba804c44ecb441bca92f499be9377e1 vagalume-0.8.5.tar.gz
Index: vagalume.spec
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-15/vagalume.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vagalume.spec 7 Feb 2011 18:37:55 -0000 1.13
+++ vagalume.spec 1 Feb 2012 22:27:29 -0000 1.14
@@ -1,5 +1,5 @@
Name: vagalume
-Version: 0.8.4
+Version: 0.8.5
Release: 1%{?dist}
Summary: Last.fm client for GNOME and Maemo
@@ -101,6 +101,9 @@
%changelog
+* Wed Feb 1 2012 Michel Salim <salimma(a)fedoraproject.org> - 0.8.5-1
+- Update to 0.8.5
+
* Mon Feb 7 2011 Michel Salim <salimma(a)fedoraproject.org> - 0.8.4-1
- Update to 0.8.4
12 years, 2 months
rpms/vagalume/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 vagalume.spec, 1.14, 1.15
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/vagalume/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31007/devel
Modified Files:
.cvsignore sources vagalume.spec
Log Message:
* Wed Feb 1 2012 Michel Salim <salimma(a)fedoraproject.org> - 0.8.5-1
- Update to 0.8.5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vagalume/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 7 Feb 2011 18:17:44 -0000 1.6
+++ .cvsignore 1 Feb 2012 22:27:29 -0000 1.7
@@ -1 +1 @@
-vagalume-0.8.4.tar.gz
+vagalume-0.8.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vagalume/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 7 Feb 2011 18:17:44 -0000 1.6
+++ sources 1 Feb 2012 22:27:29 -0000 1.7
@@ -1 +1 @@
-460b229626c55043bd8c00e1af3968b7 vagalume-0.8.4.tar.gz
+fba804c44ecb441bca92f499be9377e1 vagalume-0.8.5.tar.gz
Index: vagalume.spec
===================================================================
RCS file: /cvs/free/rpms/vagalume/devel/vagalume.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vagalume.spec 25 Jan 2012 15:01:31 -0000 1.14
+++ vagalume.spec 1 Feb 2012 22:27:29 -0000 1.15
@@ -1,6 +1,6 @@
Name: vagalume
-Version: 0.8.4
-Release: 2%{?dist}
+Version: 0.8.5
+Release: 1%{?dist}
Summary: Last.fm client for GNOME and Maemo
Group: Applications/Multimedia
@@ -101,6 +101,9 @@
%changelog
+* Wed Feb 1 2012 Michel Salim <salimma(a)fedoraproject.org> - 0.8.5-1
+- Update to 0.8.5
+
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months
rpms/mame/F-15 mame-systemlibs.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 mame.spec, 1.55, 1.56 sources, 1.47, 1.48 mame-gcc47.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22532
Modified Files:
.cvsignore mame.spec sources
Added Files:
mame-systemlibs.patch
Removed Files:
mame-gcc47.patch
Log Message:
* Mon Jan 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u7-1
- Updated to 0.144u7
- Dropped upstreamed gcc-4.7 patch
- Patched to use system libflac, libjpeg needs more work
mame-systemlibs.patch:
makefile | 30 ++++++++++++++++++++++++++----
src/emu/sound/samples.c | 6 +++++-
src/lib/util/chd.c | 6 +++++-
src/mame/drivers/sliver.c | 2 +-
4 files changed, 37 insertions(+), 7 deletions(-)
--- NEW FILE mame-systemlibs.patch ---
diff -up mame-0.144u7/makefile.systemlibs mame-0.144u7/makefile
--- mame-0.144u7/makefile.systemlibs 2012-02-01 19:33:24.321723366 +0100
+++ mame-0.144u7/makefile 2012-02-01 19:33:27.444741982 +0100
@@ -211,6 +211,12 @@ BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
BUILD_ZLIB = 1
+# uncomment next line to build libjpeg as part of MAME build
+BUILD_JPEG = 1
+
+# uncomment next line to build libflac as part of MAME build
+BUILD_FLAC = 1
+
# uncomment next line to include the symbols
# SYMBOLS = 1
@@ -411,7 +417,9 @@ DEFS += -DUSE_NETWORK
endif
# need to ensure FLAC functions are statically linked
+ifeq ($(BUILD_FLAC),1)
DEFS += -DFLAC__NO_DLL
+endif
@@ -622,14 +630,30 @@ LIBS += -lz
ZLIB =
endif
+# add jpeg library
+ifeq ($(BUILD_JPEG),1)
+INCPATH += -I$(SRC)/lib/libjpeg
+JPEG_LIB = $(OBJ)/libjpeg.a
+else
+LIBS += -ljpeg
+JPEG_LIB =
+endif
+
+# add flac library
+ifeq ($(BUILD_FLAC),1)
+INCPATH += -I$(SRC)/lib/libflac/include
+FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
+else
+LIBS += -lFLAC -lFLAC++
+FLAC_LIB =
+endif
+
# add SoftFloat floating point emulation library
SOFTFLOAT = $(OBJ)/libsoftfloat.a
# add formats emulation library
FORMATS_LIB = $(OBJ)/libformats.a
-JPEG_LIB = $(OBJ)/libjpeg.a
-
#-------------------------------------------------
# 'default' target needs to go here, before the
# include files which define additional targets
@@ -639,8 +663,6 @@ default: maketree buildtools emulator
all: default tools
-FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
-
#-------------------------------------------------
# defines needed by multiple make files
diff -up mame-0.144u7/src/emu/sound/samples.c.systemlibs mame-0.144u7/src/emu/sound/samples.c
--- mame-0.144u7/src/emu/sound/samples.c.systemlibs 2012-02-01 19:33:24.436724052 +0100
+++ mame-0.144u7/src/emu/sound/samples.c 2012-02-01 19:33:25.185728517 +0100
@@ -1,7 +1,11 @@
#include "emu.h"
#include "emuopts.h"
#include "samples.h"
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
typedef struct _sample_channel sample_channel;
struct _sample_channel
diff -up mame-0.144u7/src/lib/util/chd.c.systemlibs mame-0.144u7/src/lib/util/chd.c
--- mame-0.144u7/src/lib/util/chd.c.systemlibs 2012-02-01 19:33:24.573724868 +0100
+++ mame-0.144u7/src/lib/util/chd.c 2012-02-01 19:33:25.187728529 +0100
@@ -48,7 +48,11 @@
#include <stdlib.h>
#include <new>
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
/***************************************************************************
diff -up mame-0.144u7/src/mame/drivers/sliver.c.systemlibs mame-0.144u7/src/mame/drivers/sliver.c
--- mame-0.144u7/src/mame/drivers/sliver.c.systemlibs 2012-02-01 19:33:24.785726133 +0100
+++ mame-0.144u7/src/mame/drivers/sliver.c 2012-02-01 19:33:25.189728541 +0100
@@ -67,7 +67,7 @@ Notes:
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
#include "video/ramdac.h"
-#include "../../lib/libjpeg/jpeglib.h"
+#include <jpeglib.h>
#define FIFO_SIZE 1024
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 16 Jan 2012 08:33:49 -0000 1.47
+++ .cvsignore 1 Feb 2012 21:51:07 -0000 1.48
@@ -5,3 +5,4 @@
0144u4_diff.zip
0144u5_diff.zip
0144u6_diff.zip
+0144u7_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/mame.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mame.spec 16 Jan 2012 08:33:49 -0000 1.55
+++ mame.spec 1 Feb 2012 21:51:07 -0000 1.56
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 144
-%global sourceupdate 6
+%global sourceupdate 7
Name: mame
%if 0%{?sourceupdate}
@@ -28,17 +28,19 @@
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
-#Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip
+Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip
#Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip
#Source9: http://mamedev.org/updates/0%{baseversion}u9_diff.zip
%endif
Patch0: %{name}-fortify.patch
-Patch1: %{name}-gcc47.patch
+Patch1: %{name}-systemlibs.patch
Patch2: %{name}-verbosebuild.patch
BuildRequires: expat-devel
+BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
+# BuildRequires: libjpeg-devel
BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
@@ -102,7 +104,7 @@
done
%endif
%patch0 -p1 -b .fortify
-%patch1 -p1 -b .gcc47
+%patch1 -p1 -b .systemlibs
%patch2 -p1 -b .verbosebuild
#fix encoding
@@ -143,14 +145,17 @@
RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//)
%if %{with ldplayer}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" TARGET=ldplayer
%endif
%if %{with debug}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all
%else
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
%endif
@@ -250,6 +255,11 @@
%changelog
+* Mon Jan 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u7-1
+- Updated to 0.144u7
+- Dropped upstreamed gcc-4.7 patch
+- Patched to use system libflac, libjpeg needs more work
+
* Mon Jan 16 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u6-1
- Updated to 0.144u6
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 16 Jan 2012 08:33:49 -0000 1.47
+++ sources 1 Feb 2012 21:51:07 -0000 1.48
@@ -5,3 +5,4 @@
fd2b7811b53a61028daff87cdfd775eb 0144u4_diff.zip
2425f1d27514c16b1044177b4374d9ec 0144u5_diff.zip
006609c0896cb3c2d65d501123e277be 0144u6_diff.zip
+f80e425a280406ae6e767f4676dcade0 0144u7_diff.zip
--- mame-gcc47.patch DELETED ---
12 years, 2 months
rpms/mame/F-16 mame-systemlibs.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 mame.spec, 1.55, 1.56 sources, 1.47, 1.48 mame-gcc47.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22402
Modified Files:
.cvsignore mame.spec sources
Added Files:
mame-systemlibs.patch
Removed Files:
mame-gcc47.patch
Log Message:
* Mon Jan 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u7-1
- Updated to 0.144u7
- Dropped upstreamed gcc-4.7 patch
- Patched to use system libflac, libjpeg needs more work
mame-systemlibs.patch:
makefile | 30 ++++++++++++++++++++++++++----
src/emu/sound/samples.c | 6 +++++-
src/lib/util/chd.c | 6 +++++-
src/mame/drivers/sliver.c | 2 +-
4 files changed, 37 insertions(+), 7 deletions(-)
--- NEW FILE mame-systemlibs.patch ---
diff -up mame-0.144u7/makefile.systemlibs mame-0.144u7/makefile
--- mame-0.144u7/makefile.systemlibs 2012-02-01 19:33:24.321723366 +0100
+++ mame-0.144u7/makefile 2012-02-01 19:33:27.444741982 +0100
@@ -211,6 +211,12 @@ BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
BUILD_ZLIB = 1
+# uncomment next line to build libjpeg as part of MAME build
+BUILD_JPEG = 1
+
+# uncomment next line to build libflac as part of MAME build
+BUILD_FLAC = 1
+
# uncomment next line to include the symbols
# SYMBOLS = 1
@@ -411,7 +417,9 @@ DEFS += -DUSE_NETWORK
endif
# need to ensure FLAC functions are statically linked
+ifeq ($(BUILD_FLAC),1)
DEFS += -DFLAC__NO_DLL
+endif
@@ -622,14 +630,30 @@ LIBS += -lz
ZLIB =
endif
+# add jpeg library
+ifeq ($(BUILD_JPEG),1)
+INCPATH += -I$(SRC)/lib/libjpeg
+JPEG_LIB = $(OBJ)/libjpeg.a
+else
+LIBS += -ljpeg
+JPEG_LIB =
+endif
+
+# add flac library
+ifeq ($(BUILD_FLAC),1)
+INCPATH += -I$(SRC)/lib/libflac/include
+FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
+else
+LIBS += -lFLAC -lFLAC++
+FLAC_LIB =
+endif
+
# add SoftFloat floating point emulation library
SOFTFLOAT = $(OBJ)/libsoftfloat.a
# add formats emulation library
FORMATS_LIB = $(OBJ)/libformats.a
-JPEG_LIB = $(OBJ)/libjpeg.a
-
#-------------------------------------------------
# 'default' target needs to go here, before the
# include files which define additional targets
@@ -639,8 +663,6 @@ default: maketree buildtools emulator
all: default tools
-FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
-
#-------------------------------------------------
# defines needed by multiple make files
diff -up mame-0.144u7/src/emu/sound/samples.c.systemlibs mame-0.144u7/src/emu/sound/samples.c
--- mame-0.144u7/src/emu/sound/samples.c.systemlibs 2012-02-01 19:33:24.436724052 +0100
+++ mame-0.144u7/src/emu/sound/samples.c 2012-02-01 19:33:25.185728517 +0100
@@ -1,7 +1,11 @@
#include "emu.h"
#include "emuopts.h"
#include "samples.h"
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
typedef struct _sample_channel sample_channel;
struct _sample_channel
diff -up mame-0.144u7/src/lib/util/chd.c.systemlibs mame-0.144u7/src/lib/util/chd.c
--- mame-0.144u7/src/lib/util/chd.c.systemlibs 2012-02-01 19:33:24.573724868 +0100
+++ mame-0.144u7/src/lib/util/chd.c 2012-02-01 19:33:25.187728529 +0100
@@ -48,7 +48,11 @@
#include <stdlib.h>
#include <new>
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
/***************************************************************************
diff -up mame-0.144u7/src/mame/drivers/sliver.c.systemlibs mame-0.144u7/src/mame/drivers/sliver.c
--- mame-0.144u7/src/mame/drivers/sliver.c.systemlibs 2012-02-01 19:33:24.785726133 +0100
+++ mame-0.144u7/src/mame/drivers/sliver.c 2012-02-01 19:33:25.189728541 +0100
@@ -67,7 +67,7 @@ Notes:
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
#include "video/ramdac.h"
-#include "../../lib/libjpeg/jpeglib.h"
+#include <jpeglib.h>
#define FIFO_SIZE 1024
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 16 Jan 2012 08:33:40 -0000 1.47
+++ .cvsignore 1 Feb 2012 21:50:57 -0000 1.48
@@ -5,3 +5,4 @@
0144u4_diff.zip
0144u5_diff.zip
0144u6_diff.zip
+0144u7_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/mame.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mame.spec 16 Jan 2012 08:33:40 -0000 1.55
+++ mame.spec 1 Feb 2012 21:50:57 -0000 1.56
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 144
-%global sourceupdate 6
+%global sourceupdate 7
Name: mame
%if 0%{?sourceupdate}
@@ -28,17 +28,19 @@
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
-#Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip
+Source7: http://mamedev.org/updates/0%{baseversion}u7_diff.zip
#Source8: http://mamedev.org/updates/0%{baseversion}u8_diff.zip
#Source9: http://mamedev.org/updates/0%{baseversion}u9_diff.zip
%endif
Patch0: %{name}-fortify.patch
-Patch1: %{name}-gcc47.patch
+Patch1: %{name}-systemlibs.patch
Patch2: %{name}-verbosebuild.patch
BuildRequires: expat-devel
+BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
+# BuildRequires: libjpeg-devel
BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
@@ -102,7 +104,7 @@
done
%endif
%patch0 -p1 -b .fortify
-%patch1 -p1 -b .gcc47
+%patch1 -p1 -b .systemlibs
%patch2 -p1 -b .verbosebuild
#fix encoding
@@ -143,14 +145,17 @@
RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//)
%if %{with ldplayer}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" TARGET=ldplayer
%endif
%if %{with debug}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all
%else
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
%endif
@@ -250,6 +255,11 @@
%changelog
+* Mon Jan 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u7-1
+- Updated to 0.144u7
+- Dropped upstreamed gcc-4.7 patch
+- Patched to use system libflac, libjpeg needs more work
+
* Mon Jan 16 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u6-1
- Updated to 0.144u6
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 16 Jan 2012 08:33:40 -0000 1.47
+++ sources 1 Feb 2012 21:50:57 -0000 1.48
@@ -5,3 +5,4 @@
fd2b7811b53a61028daff87cdfd775eb 0144u4_diff.zip
2425f1d27514c16b1044177b4374d9ec 0144u5_diff.zip
006609c0896cb3c2d65d501123e277be 0144u6_diff.zip
+f80e425a280406ae6e767f4676dcade0 0144u7_diff.zip
--- mame-gcc47.patch DELETED ---
12 years, 2 months