rpms/dvdstyler/F-18 .cvsignore, 1.11, 1.12 dvdstyler.spec, 1.21, 1.22 sources, 1.12, 1.13
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/dvdstyler/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12593
Modified Files:
.cvsignore dvdstyler.spec sources
Log Message:
* Sun Nov 04 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.3-1
- New upstream release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-18/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 28 Aug 2012 16:09:05 -0000 1.11
+++ .cvsignore 5 Nov 2012 00:30:14 -0000 1.12
@@ -1 +1 @@
-DVDStyler-2.3.tar.bz2
+DVDStyler-2.3.3.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-18/dvdstyler.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dvdstyler.spec 28 Aug 2012 16:09:05 -0000 1.21
+++ dvdstyler.spec 5 Nov 2012 00:30:14 -0000 1.22
@@ -1,6 +1,6 @@
Name: dvdstyler
Epoch: 1
-Version: 2.3
+Version: 2.3.3
Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
@@ -90,6 +90,9 @@
%{_mandir}/*/*.gz
%changelog
+* Sun Nov 04 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.3-1
+- New upstream release.
+
* Sun Aug 26 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3-1
- Update upstream release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-18/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 28 Aug 2012 16:09:05 -0000 1.12
+++ sources 5 Nov 2012 00:30:14 -0000 1.13
@@ -1 +1 @@
-0f1b4e8e3e6acc24e73634160e727f20 DVDStyler-2.3.tar.bz2
+73d897ab26a7fb3792bf1f9bd90e0225 DVDStyler-2.3.3.tar.bz2
11 years, 6 months
rpms/dvdstyler/devel .cvsignore, 1.11, 1.12 dvdstyler.spec, 1.21, 1.22 sources, 1.12, 1.13
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/dvdstyler/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6500
Modified Files:
.cvsignore dvdstyler.spec sources
Log Message:
* Sun Nov 04 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.3-1
- New upstream release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 26 Aug 2012 14:40:03 -0000 1.11
+++ .cvsignore 4 Nov 2012 23:04:13 -0000 1.12
@@ -1 +1 @@
-DVDStyler-2.3.tar.bz2
+DVDStyler-2.3.3.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dvdstyler.spec 26 Aug 2012 14:40:03 -0000 1.21
+++ dvdstyler.spec 4 Nov 2012 23:04:13 -0000 1.22
@@ -1,6 +1,6 @@
Name: dvdstyler
Epoch: 1
-Version: 2.3
+Version: 2.3.3
Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
@@ -90,6 +90,9 @@
%{_mandir}/*/*.gz
%changelog
+* Sun Nov 04 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.3-1
+- New upstream release.
+
* Sun Aug 26 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3-1
- Update upstream release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 26 Aug 2012 14:40:03 -0000 1.12
+++ sources 4 Nov 2012 23:04:13 -0000 1.13
@@ -1 +1 @@
-0f1b4e8e3e6acc24e73634160e727f20 DVDStyler-2.3.tar.bz2
+73d897ab26a7fb3792bf1f9bd90e0225 DVDStyler-2.3.3.tar.bz2
11 years, 6 months
rpms/gstreamer-ffmpeg/F-18 .cvsignore, 1.13, 1.14 gstreamer-ffmpeg.spec, 1.22, 1.23 sources, 1.13, 1.14
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20902
Modified Files:
.cvsignore gstreamer-ffmpeg.spec sources
Log Message:
* Sun Nov 4 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-4
- Upgrade the buildin libav to 0.8.4 to get all the security fixes from
upstream libav
- Build included libav with the default RPM_OPT_FLAGS (rf#2560, rf#2472)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-18/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 Jul 2012 14:07:05 -0000 1.13
+++ .cvsignore 4 Nov 2012 16:17:30 -0000 1.14
@@ -1,2 +1,2 @@
gst-ffmpeg-0.10.13.tar.bz2
-libav-0.8.3.tar.xz
+libav-0.8.4.tar.xz
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-18/gstreamer-ffmpeg.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gstreamer-ffmpeg.spec 12 Jul 2012 14:35:20 -0000 1.22
+++ gstreamer-ffmpeg.spec 4 Nov 2012 16:17:30 -0000 1.23
@@ -1,6 +1,6 @@
Name: gstreamer-ffmpeg
Version: 0.10.13
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
# the ffmpeg plugin is LGPL, the postproc plugin is GPL
@@ -8,7 +8,7 @@
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar...
# We drop in a newer libav to get all the security bugfixes from there!
-Source1: http://libav.org/releases/libav-0.8.3.tar.xz
+Source1: http://libav.org/releases/libav-0.8.4.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
# Patches cherry picked from upstream for newer libav and bugfixes
Patch1: 0001-configure.ac-Fix-for-new-libav.patch
@@ -44,7 +44,7 @@
%prep
%setup -q -n gst-ffmpeg-%{version} -a 1
rm -r gst-libs/ext/libav
-mv libav-0.8.3 gst-libs/ext/libav
+mv libav-0.8.4 gst-libs/ext/libav
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -66,12 +66,12 @@
%configure --disable-dependency-tracking --disable-static \
--with-package-name="gst-plugins-ffmpeg rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
- --with-ffmpeg-extra-configure=--enable-runtime-cpudetect
-make %{?_smp_mflags}
+ --with-ffmpeg-extra-configure="--enable-runtime-cpudetect --arch=%{_target_cpu} --optflags=\\\"\\\$RPM_OPT_FLAGS\\\""
+make %{?_smp_mflags} V=1
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT V=1
rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-0.10/libgst*.la
@@ -83,6 +83,11 @@
%changelog
+* Sun Nov 4 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-4
+- Upgrade the buildin libav to 0.8.4 to get all the security fixes from
+ upstream libav
+- Build included libav with the default RPM_OPT_FLAGS (rf#2560, rf#2472)
+
* Thu Jul 12 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-3
- Switch to the build in libav for now, gst-ffmpeg wants libav-0.8,
and the system ffmpeg is 0.11, which is more or less the unreleased
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-18/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 12 Jul 2012 14:07:06 -0000 1.13
+++ sources 4 Nov 2012 16:17:30 -0000 1.14
@@ -1,2 +1,2 @@
7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2
-a15280a6a5d1cbc2dac392d22680c257 libav-0.8.3.tar.xz
+4634b35dec327f9aba61b3b894df03f7 libav-0.8.4.tar.xz
11 years, 6 months
rpms/gstreamer-ffmpeg/devel .cvsignore, 1.13, 1.14 gstreamer-ffmpeg.spec, 1.22, 1.23 sources, 1.13, 1.14
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20722
Modified Files:
.cvsignore gstreamer-ffmpeg.spec sources
Log Message:
* Sun Nov 4 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-4
- Upgrade the buildin libav to 0.8.4 to get all the security fixes from
upstream libav
- Build included libav with the default RPM_OPT_FLAGS (rf#2560, rf#2472)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 Jul 2012 14:07:05 -0000 1.13
+++ .cvsignore 4 Nov 2012 16:16:38 -0000 1.14
@@ -1,2 +1,2 @@
gst-ffmpeg-0.10.13.tar.bz2
-libav-0.8.3.tar.xz
+libav-0.8.4.tar.xz
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/gstreamer-ffmpeg.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gstreamer-ffmpeg.spec 12 Jul 2012 14:35:20 -0000 1.22
+++ gstreamer-ffmpeg.spec 4 Nov 2012 16:16:38 -0000 1.23
@@ -1,6 +1,6 @@
Name: gstreamer-ffmpeg
Version: 0.10.13
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
# the ffmpeg plugin is LGPL, the postproc plugin is GPL
@@ -8,7 +8,7 @@
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar...
# We drop in a newer libav to get all the security bugfixes from there!
-Source1: http://libav.org/releases/libav-0.8.3.tar.xz
+Source1: http://libav.org/releases/libav-0.8.4.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
# Patches cherry picked from upstream for newer libav and bugfixes
Patch1: 0001-configure.ac-Fix-for-new-libav.patch
@@ -44,7 +44,7 @@
%prep
%setup -q -n gst-ffmpeg-%{version} -a 1
rm -r gst-libs/ext/libav
-mv libav-0.8.3 gst-libs/ext/libav
+mv libav-0.8.4 gst-libs/ext/libav
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -66,12 +66,12 @@
%configure --disable-dependency-tracking --disable-static \
--with-package-name="gst-plugins-ffmpeg rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
- --with-ffmpeg-extra-configure=--enable-runtime-cpudetect
-make %{?_smp_mflags}
+ --with-ffmpeg-extra-configure="--enable-runtime-cpudetect --arch=%{_target_cpu} --optflags=\\\"\\\$RPM_OPT_FLAGS\\\""
+make %{?_smp_mflags} V=1
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT V=1
rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-0.10/libgst*.la
@@ -83,6 +83,11 @@
%changelog
+* Sun Nov 4 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-4
+- Upgrade the buildin libav to 0.8.4 to get all the security fixes from
+ upstream libav
+- Build included libav with the default RPM_OPT_FLAGS (rf#2560, rf#2472)
+
* Thu Jul 12 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-3
- Switch to the build in libav for now, gst-ffmpeg wants libav-0.8,
and the system ffmpeg is 0.11, which is more or less the unreleased
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 12 Jul 2012 14:07:06 -0000 1.13
+++ sources 4 Nov 2012 16:16:38 -0000 1.14
@@ -1,2 +1,2 @@
7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2
-a15280a6a5d1cbc2dac392d22680c257 libav-0.8.3.tar.xz
+4634b35dec327f9aba61b3b894df03f7 libav-0.8.4.tar.xz
11 years, 6 months
rpms/mame/F-16 .cvsignore, 1.65, 1.66 mame.spec, 1.73, 1.74 sources, 1.65, 1.66
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv540
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
- Updated to 0.147u2
- Conditionalised the low memory workaround
- Use system libjpeg-turbo on Fedora 19 and above
- Do not delete the entire obj/, leave the bits needed by the -debuginfo package
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore 8 Oct 2012 17:44:04 -0000 1.65
+++ .cvsignore 4 Nov 2012 09:54:08 -0000 1.66
@@ -1,2 +1,3 @@
mame0147s.exe
0147u1_diff.zip
+0147u2_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/mame.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- mame.spec 8 Oct 2012 17:44:04 -0000 1.73
+++ mame.spec 4 Nov 2012 09:54:08 -0000 1.74
@@ -5,7 +5,13 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 1
+%global sourceupdate 2
+
+# work around low memory on the RPM Fusion builder
+%bcond_without lowmem
+%if %{with lowmem}
+%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+%endif
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +29,7 @@
%if 0%{?sourceupdate}
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
+Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#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
@@ -39,13 +45,17 @@
BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
-# BuildRequires: libjpeg-devel
+%if 0%{?fedora} >= 19
+BuildRequires: libjpeg-devel
+%endif
BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
Requires: %{name}-data = %{version}-%{release}
+%if 0%{?fedora} < 19
Provides: bundled(libjpeg) = 8c
+%endif
Provides: bundled(lzma-sdk) = 9.22
%description
@@ -85,7 +95,9 @@
Summary: Multi Emulator Super System
Requires: mess-data = %{version}-%{release}
+%if 0%{?fedora} < 19
Provides: bundled(libjpeg) = 8c
+%endif
Provides: bundled(lzma-sdk) = 9.22
%description -n mess
@@ -175,8 +187,7 @@
EOF
#make a copy for MESS
-cp %{name}.ini mess.ini
-sed -i 's/%{name}/mess/' mess.ini
+sed 's/%{name}/mess/g' %{name}.ini > mess.ini
%build
@@ -185,7 +196,13 @@
#save some space
MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
- BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="
+ BUILD_FLAC=0 SUFFIX64="
+
+%if 0%{?fedora} >= 19
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=0"
+%else
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=1"
+%endif
%if %{with ldplayer}
make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer \
@@ -194,13 +211,13 @@
%if %{with debug}
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+find obj -type f -not -name \*.lh -and -not -name drivlist.c -exec rm {} \;
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TARGET=mess \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%else
make %{?_smp_mflags} $MAME_FLAGS \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+find obj -type f -not -name \*.lh -and -not -name drivlist.c -exec rm {} \;
make %{?_smp_mflags} $MAME_FLAGS TARGET=mess\
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%endif
@@ -344,9 +361,20 @@
%changelog
+* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
+- Updated to 0.147u2
+- Conditionalised the low memory workaround
+- Use system libjpeg-turbo on Fedora 19 and above
+- Do not delete the entire obj/, leave the bits needed by the -debuginfo package
+
+* Sat Oct 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-2
+- Work around low memory on the RPM Fusion builder
+
* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
- Updated to 0.147u1
- Dropped missing whatsnew.txt workaround
+- Fixed incorrect paths in mess.ini
+- Remove the object tree between mame and mess builds to prevent mess using /etc/mame
* Fri Sep 21 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
- Updated to 0.147
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources 8 Oct 2012 17:44:04 -0000 1.65
+++ sources 4 Nov 2012 09:54:08 -0000 1.66
@@ -1,2 +1,3 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
+c0306cbf583309d23549529f441e97f2 0147u2_diff.zip
11 years, 6 months
rpms/mame/F-17 .cvsignore, 1.65, 1.66 mame.spec, 1.74, 1.75 sources, 1.65, 1.66
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24747
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
- Updated to 0.147u2
- Conditionalised the low memory workaround
- Use system libjpeg-turbo on Fedora 19 and above
- Do not delete the entire obj/, leave the bits needed by the -debuginfo package
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .cvsignore 8 Oct 2012 17:44:00 -0000 1.65
+++ .cvsignore 4 Nov 2012 07:25:48 -0000 1.66
@@ -1,2 +1,3 @@
mame0147s.exe
0147u1_diff.zip
+0147u2_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/mame.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mame.spec 8 Oct 2012 17:44:00 -0000 1.74
+++ mame.spec 4 Nov 2012 07:25:48 -0000 1.75
@@ -5,7 +5,13 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 1
+%global sourceupdate 2
+
+# work around low memory on the RPM Fusion builder
+%bcond_without lowmem
+%if %{with lowmem}
+%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+%endif
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +29,7 @@
%if 0%{?sourceupdate}
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
+Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#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
@@ -39,13 +45,17 @@
BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
-# BuildRequires: libjpeg-devel
+%if 0%{?fedora} >= 19
+BuildRequires: libjpeg-devel
+%endif
BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
Requires: %{name}-data = %{version}-%{release}
+%if 0%{?fedora} < 19
Provides: bundled(libjpeg) = 8c
+%endif
Provides: bundled(lzma-sdk) = 9.22
%description
@@ -85,7 +95,9 @@
Summary: Multi Emulator Super System
Requires: mess-data = %{version}-%{release}
+%if 0%{?fedora} < 19
Provides: bundled(libjpeg) = 8c
+%endif
Provides: bundled(lzma-sdk) = 9.22
%description -n mess
@@ -175,8 +187,7 @@
EOF
#make a copy for MESS
-cp %{name}.ini mess.ini
-sed -i 's/%{name}/mess/' mess.ini
+sed 's/%{name}/mess/g' %{name}.ini > mess.ini
%build
@@ -185,7 +196,13 @@
#save some space
MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
- BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="
+ BUILD_FLAC=0 SUFFIX64="
+
+%if 0%{?fedora} >= 19
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=0"
+%else
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=1"
+%endif
%if %{with ldplayer}
make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer \
@@ -194,13 +211,13 @@
%if %{with debug}
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+find obj -type f -not -name \*.lh -and -not -name drivlist.c -exec rm {} \;
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TARGET=mess \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%else
make %{?_smp_mflags} $MAME_FLAGS \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+find obj -type f -not -name \*.lh -and -not -name drivlist.c -exec rm {} \;
make %{?_smp_mflags} $MAME_FLAGS TARGET=mess\
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%endif
@@ -344,9 +361,20 @@
%changelog
+* Tue Oct 30 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u2-1
+- Updated to 0.147u2
+- Conditionalised the low memory workaround
+- Use system libjpeg-turbo on Fedora 19 and above
+- Do not delete the entire obj/, leave the bits needed by the -debuginfo package
+
+* Sat Oct 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-2
+- Work around low memory on the RPM Fusion builder
+
* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
- Updated to 0.147u1
- Dropped missing whatsnew.txt workaround
+- Fixed incorrect paths in mess.ini
+- Remove the object tree between mame and mess builds to prevent mess using /etc/mame
* Fri Sep 21 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
- Updated to 0.147
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-17/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources 8 Oct 2012 17:44:00 -0000 1.65
+++ sources 4 Nov 2012 07:25:48 -0000 1.66
@@ -1,2 +1,3 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
+c0306cbf583309d23549529f441e97f2 0147u2_diff.zip
11 years, 6 months
rpms/pangzero/F-18 10_nowebpage.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pangzero.spec, 1.5, 1.6 sources, 1.2, 1.3 pangzero-1.2-nowin32.patch, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/pangzero/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32469
Modified Files:
.cvsignore pangzero.spec sources
Added Files:
10_nowebpage.patch
Removed Files:
pangzero-1.2-nowin32.patch
Log Message:
* Sun Oct 28 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.1-1
- New upstream: https://github.com/jwrdegoede/pangzero
- New upstream version 1.4.1, which works with latest perl-SDL
10_nowebpage.patch:
Globals.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE 10_nowebpage.patch ---
Author: Paul Wise <pabs(a)debian.org>
Description: Default ShowWebsite so webpage not called on exit
Bug-Debian: http://bugs.debian.org/481998
Last-Update: 2012-03-04
Forwarded: no
--- a/lib/Games/PangZero/Globals.pm
+++ b/lib/Games/PangZero/Globals.pm
@@ -242,6 +242,6 @@
$Games::PangZero::FullScreen = 1;
$Games::PangZero::UnicodeMode = 0;
$Games::PangZero::Slippery = 0;
-$Games::PangZero::ShowWebsite = 0;
+$Games::PangZero::ShowWebsite = 1.4.1;
1;
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/pangzero/F-18/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Sep 2008 11:00:00 -0000 1.2
+++ .cvsignore 3 Nov 2012 20:43:25 -0000 1.3
@@ -1 +1 @@
-pangzero-1.3.tar.gz
+pangzero-master.tar.gz
Index: pangzero.spec
===================================================================
RCS file: /cvs/free/rpms/pangzero/F-18/pangzero.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pangzero.spec 8 Feb 2012 21:54:43 -0000 1.5
+++ pangzero.spec 3 Nov 2012 20:43:25 -0000 1.6
@@ -1,19 +1,25 @@
Name: pangzero
-Version: 1.3
-Release: 4%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
Summary: A clone and enhancement of Super Pang
Group: Amusements/Games
License: GPLv2
URL: http://apocalypse.rulez.org/pangzero
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# This was downloaded from: https://github.com/jwrdegoede/pangzero
+# Using githubs download current revision functionality
+# Note no proper tarbals there unfortunately :|
+Source0: pangzero-master.tar.gz
Source1: %{name}.desktop
-Patch0: pangzero-1.2-nowin32.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: 10_nowebpage.patch
BuildArch: noarch
BuildRequires: desktop-file-utils
BuildRequires: lame
-BuildRequires: perl-SDL >= 2.1.0
+BuildRequires: perl-SDL >= 2.536
BuildRequires: vorbis-tools
+BuildRequires: perl(Module::Build)
+BuildRequires: perl(File::ShareDir)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(Time::HiRes)
Requires: hicolor-icon-theme
%description
@@ -23,69 +29,59 @@
%prep
-%setup -q
+%setup -q -n pangzero-master
%patch0 -p1
-# Set the data location
-sed -i 's|$::DataDir = '`echo -e "\047\047"`'|$::DataDir = '`echo -e "\047%{_datadir}/%{name}\047"`'|' bin/pangzero
-
# Convert audio, Fedora's SDL does not support MP3
-lame --silent --decode data/UPiPang.mp3 - | oggenc -Q - -o data/UPiPang.ogg ||:
-
-# Use the ogg instead of mp3
-sed -i 's|UPiPang.mp3|UPiPang.ogg|' bin/pangzero
+lame --silent --decode data/UPiPang.mp3 - | oggenc -Q - -o data/UPiPang.ogg
%build
-%configure
-make %{?_smp_mflags}
-
+perl Build.PL --installdirs vendor
+./Build
%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+./Build install --destdir=%{buildroot}
+rm %{buildroot}%{perl_vendorarch}/auto/Games/PangZero/.packlist
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-install -m0644 data/UPiPang.ogg %{buildroot}%{_datadir}/%{name}
-
desktop-file-install --vendor "" \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
-
install -m0644 data/icon.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%clean
-rm -rf %{buildroot}
-
-
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/pangzero
-%{_datadir}/%{name}
+%{perl_vendorlib}/Games
+%{perl_vendorlib}/auto
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
-%exclude %{_datadir}/%{name}/UPiPang.mp3
-%exclude %{_datadir}/%{name}/icon.ico
+%exclude %{perl_vendorlib}/auto/share/dist/Games-PangZero/UPiPang.mp3
+%exclude %{perl_vendorlib}/auto/share/dist/Games-PangZero/icon.ico
+%exclude %{perl_vendorlib}/auto/share/dist/Games-PangZero/icon.png
%changelog
+* Sun Oct 28 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.1-1
+- New upstream: https://github.com/jwrdegoede/pangzero
+- New upstream version 1.4.1, which works with latest perl-SDL
+
* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/pangzero/F-18/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Sep 2008 11:00:00 -0000 1.2
+++ sources 3 Nov 2012 20:43:25 -0000 1.3
@@ -1 +1 @@
-57a3ba5bf4f0e4a9590fbd6606c9f91c pangzero-1.3.tar.gz
+8f8e951d8220f60d7ee70b77a6872da6 pangzero-master.tar.gz
--- pangzero-1.2-nowin32.patch DELETED ---
11 years, 6 months
rpms/pangzero/devel 10_nowebpage.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pangzero.spec, 1.5, 1.6 sources, 1.2, 1.3 pangzero-1.2-nowin32.patch, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/pangzero/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32241
Modified Files:
.cvsignore pangzero.spec sources
Added Files:
10_nowebpage.patch
Removed Files:
pangzero-1.2-nowin32.patch
Log Message:
* Sun Oct 28 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.1-1
- New upstream: https://github.com/jwrdegoede/pangzero
- New upstream version 1.4.1, which works with latest perl-SDL
10_nowebpage.patch:
Globals.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE 10_nowebpage.patch ---
Author: Paul Wise <pabs(a)debian.org>
Description: Default ShowWebsite so webpage not called on exit
Bug-Debian: http://bugs.debian.org/481998
Last-Update: 2012-03-04
Forwarded: no
--- a/lib/Games/PangZero/Globals.pm
+++ b/lib/Games/PangZero/Globals.pm
@@ -242,6 +242,6 @@
$Games::PangZero::FullScreen = 1;
$Games::PangZero::UnicodeMode = 0;
$Games::PangZero::Slippery = 0;
-$Games::PangZero::ShowWebsite = 0;
+$Games::PangZero::ShowWebsite = 1.4.1;
1;
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/pangzero/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Sep 2008 11:00:00 -0000 1.2
+++ .cvsignore 3 Nov 2012 20:42:13 -0000 1.3
@@ -1 +1 @@
-pangzero-1.3.tar.gz
+pangzero-master.tar.gz
Index: pangzero.spec
===================================================================
RCS file: /cvs/free/rpms/pangzero/devel/pangzero.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pangzero.spec 8 Feb 2012 21:54:43 -0000 1.5
+++ pangzero.spec 3 Nov 2012 20:42:13 -0000 1.6
@@ -1,19 +1,25 @@
Name: pangzero
-Version: 1.3
-Release: 4%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
Summary: A clone and enhancement of Super Pang
Group: Amusements/Games
License: GPLv2
URL: http://apocalypse.rulez.org/pangzero
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# This was downloaded from: https://github.com/jwrdegoede/pangzero
+# Using githubs download current revision functionality
+# Note no proper tarbals there unfortunately :|
+Source0: pangzero-master.tar.gz
Source1: %{name}.desktop
-Patch0: pangzero-1.2-nowin32.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: 10_nowebpage.patch
BuildArch: noarch
BuildRequires: desktop-file-utils
BuildRequires: lame
-BuildRequires: perl-SDL >= 2.1.0
+BuildRequires: perl-SDL >= 2.536
BuildRequires: vorbis-tools
+BuildRequires: perl(Module::Build)
+BuildRequires: perl(File::ShareDir)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(Time::HiRes)
Requires: hicolor-icon-theme
%description
@@ -23,69 +29,59 @@
%prep
-%setup -q
+%setup -q -n pangzero-master
%patch0 -p1
-# Set the data location
-sed -i 's|$::DataDir = '`echo -e "\047\047"`'|$::DataDir = '`echo -e "\047%{_datadir}/%{name}\047"`'|' bin/pangzero
-
# Convert audio, Fedora's SDL does not support MP3
-lame --silent --decode data/UPiPang.mp3 - | oggenc -Q - -o data/UPiPang.ogg ||:
-
-# Use the ogg instead of mp3
-sed -i 's|UPiPang.mp3|UPiPang.ogg|' bin/pangzero
+lame --silent --decode data/UPiPang.mp3 - | oggenc -Q - -o data/UPiPang.ogg
%build
-%configure
-make %{?_smp_mflags}
-
+perl Build.PL --installdirs vendor
+./Build
%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+./Build install --destdir=%{buildroot}
+rm %{buildroot}%{perl_vendorarch}/auto/Games/PangZero/.packlist
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-install -m0644 data/UPiPang.ogg %{buildroot}%{_datadir}/%{name}
-
desktop-file-install --vendor "" \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
-
install -m0644 data/icon.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%clean
-rm -rf %{buildroot}
-
-
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/pangzero
-%{_datadir}/%{name}
+%{perl_vendorlib}/Games
+%{perl_vendorlib}/auto
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
-%exclude %{_datadir}/%{name}/UPiPang.mp3
-%exclude %{_datadir}/%{name}/icon.ico
+%exclude %{perl_vendorlib}/auto/share/dist/Games-PangZero/UPiPang.mp3
+%exclude %{perl_vendorlib}/auto/share/dist/Games-PangZero/icon.ico
+%exclude %{perl_vendorlib}/auto/share/dist/Games-PangZero/icon.png
%changelog
+* Sun Oct 28 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.4.1-1
+- New upstream: https://github.com/jwrdegoede/pangzero
+- New upstream version 1.4.1, which works with latest perl-SDL
+
* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/pangzero/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Sep 2008 11:00:00 -0000 1.2
+++ sources 3 Nov 2012 20:42:13 -0000 1.3
@@ -1 +1 @@
-57a3ba5bf4f0e4a9590fbd6606c9f91c pangzero-1.3.tar.gz
+8f8e951d8220f60d7ee70b77a6872da6 pangzero-master.tar.gz
--- pangzero-1.2-nowin32.patch DELETED ---
11 years, 6 months
rpms/minidlna/F-17 minidlna-1.0.25-ffmpeg10.patch, NONE, 1.1 minidlna.service, 1.1, 1.2 minidlna.spec, 1.5, 1.6
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28776
Modified Files:
minidlna.service minidlna.spec
Added Files:
minidlna-1.0.25-ffmpeg10.patch
Log Message:
* Sat Nov 03 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.25-2
- Fixed FTBFS caused by ffmpeg 1.0
- Updated minidlna.service I forgot to commit (BZ #2294)
minidlna-1.0.25-ffmpeg10.patch:
Makefile | 12 ++++++++----
metadata.c | 6 +++---
tagutils/tagutils-plist.c | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
--- NEW FILE minidlna-1.0.25-ffmpeg10.patch ---
The new ffmpeg-1.0 comes with the headers libavutil/time.h and
libavutil/log.h. These overrule /usr/include/time.h and
minidlna-1.0.25/log.h due to the priority of '-I' set in the
Makefile
CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-I/usr/include/ffmpeg \
-I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
-I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
Here below is a patch removing the need for these search
directories. Backward compatibility could be guaranteed via
'-I/usr/include/ffmpeg'.
diff -u -p -r minidlna-1.0.25/Makefile minidlna-1.0.25-new/Makefile
--- minidlna-1.0.25/Makefile 2012-01-17 23:49:01.000000000 +0100
+++ minidlna-1.0.25-new/Makefile 2012-10-25 01:53:04.000000000 +0200
@@ -12,10 +12,14 @@
#
#CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
#CFLAGS = -Wall -g -Os -D_GNU_SOURCE
-CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
- -I/usr/include/ffmpeg \
- -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
+CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/ffmpeg
+# -I/usr/include/libavcodec
+# -I/usr/include/libavformat
+# overrules /usr/include/time.h
+# -I/usr/include/libavutil
+# nonexistant
+# -I/usr/include/ffmpeg \
+# -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
#STATIC_LINKING: CFLAGS += -DSTATIC
#STATIC_LINKING: LDFLAGS = -static
CC = gcc
diff -u -p -r minidlna-1.0.25/metadata.c minidlna-1.0.25-new/metadata.c
--- minidlna-1.0.25/metadata.c 2012-06-29 23:11:29.000000000 +0200
+++ minidlna-1.0.25-new/metadata.c 2012-10-25 01:53:37.000000000 +0200
@@ -30,9 +30,9 @@
#include "image_utils.h"
#include <jpeglib.h>
#include <setjmp.h>
-#include <avutil.h>
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavutil/avutil.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
#include "tagutils/tagutils.h"
#include "upnpglobalvars.h"
diff -u -p -r minidlna-1.0.25/tagutils/tagutils-plist.c minidlna-1.0.25-new/tagutils/tagutils-plist.c
--- minidlna-1.0.25/tagutils/tagutils-plist.c 2012-01-17 23:54:47.000000000 +0100
+++ minidlna-1.0.25-new/tagutils/tagutils-plist.c 2012-10-25 01:49:33.000000000 +0200
@@ -27,7 +27,7 @@
#include "misc.h"
#include "tagutils.h"
#include "textutils.h"
-#include "log.h"
+#include "../log.h"
#define MAX_BUF 4096
Index: minidlna.service
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-17/minidlna.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- minidlna.service 22 Jan 2012 13:21:32 -0000 1.1
+++ minidlna.service 3 Nov 2012 19:52:13 -0000 1.2
@@ -3,9 +3,11 @@
After=syslog.target local-fs.target network.target
[Service]
+User=minidlna
+Group=minidlna
Type=forking
-PIDFile=/var/run/minidlna.pid
-ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf
+PIDFile=/var/run/minidlna/minidlna.pid
+ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid
[Install]
WantedBy=multi-user.target
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-17/minidlna.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- minidlna.spec 14 Jul 2012 11:52:40 -0000 1.5
+++ minidlna.spec 3 Nov 2012 19:52:13 -0000 1.6
@@ -1,6 +1,6 @@
Name: minidlna
Version: 1.0.25
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
@@ -13,6 +13,9 @@
Source2: %{name}-1.0.24-debian-manpages.tar.gz
# tmpfiles.d configuration for the /var/run directory
Source3: %{name}-tmpfiles.conf
+# Fix FTBFS for ffmpeg-1.0
+# http://inmmc.org/ftp/soft/minidlna.diff
+Patch0: %{name}-1.0.25-ffmpeg10.patch
BuildRequires: libuuid-devel
BuildRequires: ffmpeg-devel
@@ -42,6 +45,7 @@
%prep
%setup -q
%setup -D -T -q -a 2
+%patch0 -p1
# Honor RPM_OPT_FLAGS
sed -i 's/CFLAGS = -Wall -g -O3/CFLAGS +=/' Makefile
@@ -152,6 +156,10 @@
%changelog
+* Sat Nov 03 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.25-2
+- Fixed FTBFS caused by ffmpeg 1.0
+- Updated minidlna.service I forgot to commit (BZ #2294)
+
* Sat Jul 14 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.25-1
- Updated to upstream 1.0.25
11 years, 6 months
rpms/minidlna/F-18 minidlna-1.0.25-ffmpeg10.patch, NONE, 1.1 minidlna.service, 1.1, 1.2 minidlna.spec, 1.6, 1.7
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28519
Modified Files:
minidlna.service minidlna.spec
Added Files:
minidlna-1.0.25-ffmpeg10.patch
Log Message:
* Sat Nov 03 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.25-2
- Fixed FTBFS caused by ffmpeg 1.0
- Updated minidlna.service I forgot to commit (BZ #2294)
minidlna-1.0.25-ffmpeg10.patch:
Makefile | 12 ++++++++----
metadata.c | 6 +++---
tagutils/tagutils-plist.c | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
--- NEW FILE minidlna-1.0.25-ffmpeg10.patch ---
The new ffmpeg-1.0 comes with the headers libavutil/time.h and
libavutil/log.h. These overrule /usr/include/time.h and
minidlna-1.0.25/log.h due to the priority of '-I' set in the
Makefile
CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-I/usr/include/ffmpeg \
-I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
-I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
Here below is a patch removing the need for these search
directories. Backward compatibility could be guaranteed via
'-I/usr/include/ffmpeg'.
diff -u -p -r minidlna-1.0.25/Makefile minidlna-1.0.25-new/Makefile
--- minidlna-1.0.25/Makefile 2012-01-17 23:49:01.000000000 +0100
+++ minidlna-1.0.25-new/Makefile 2012-10-25 01:53:04.000000000 +0200
@@ -12,10 +12,14 @@
#
#CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
#CFLAGS = -Wall -g -Os -D_GNU_SOURCE
-CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
- -I/usr/include/ffmpeg \
- -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
+CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/ffmpeg
+# -I/usr/include/libavcodec
+# -I/usr/include/libavformat
+# overrules /usr/include/time.h
+# -I/usr/include/libavutil
+# nonexistant
+# -I/usr/include/ffmpeg \
+# -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
#STATIC_LINKING: CFLAGS += -DSTATIC
#STATIC_LINKING: LDFLAGS = -static
CC = gcc
diff -u -p -r minidlna-1.0.25/metadata.c minidlna-1.0.25-new/metadata.c
--- minidlna-1.0.25/metadata.c 2012-06-29 23:11:29.000000000 +0200
+++ minidlna-1.0.25-new/metadata.c 2012-10-25 01:53:37.000000000 +0200
@@ -30,9 +30,9 @@
#include "image_utils.h"
#include <jpeglib.h>
#include <setjmp.h>
-#include <avutil.h>
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavutil/avutil.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
#include "tagutils/tagutils.h"
#include "upnpglobalvars.h"
diff -u -p -r minidlna-1.0.25/tagutils/tagutils-plist.c minidlna-1.0.25-new/tagutils/tagutils-plist.c
--- minidlna-1.0.25/tagutils/tagutils-plist.c 2012-01-17 23:54:47.000000000 +0100
+++ minidlna-1.0.25-new/tagutils/tagutils-plist.c 2012-10-25 01:49:33.000000000 +0200
@@ -27,7 +27,7 @@
#include "misc.h"
#include "tagutils.h"
#include "textutils.h"
-#include "log.h"
+#include "../log.h"
#define MAX_BUF 4096
Index: minidlna.service
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-18/minidlna.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- minidlna.service 22 Jan 2012 13:21:32 -0000 1.1
+++ minidlna.service 3 Nov 2012 19:51:04 -0000 1.2
@@ -3,9 +3,11 @@
After=syslog.target local-fs.target network.target
[Service]
+User=minidlna
+Group=minidlna
Type=forking
-PIDFile=/var/run/minidlna.pid
-ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf
+PIDFile=/var/run/minidlna/minidlna.pid
+ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid
[Install]
WantedBy=multi-user.target
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-18/minidlna.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- minidlna.spec 14 Jul 2012 11:52:08 -0000 1.6
+++ minidlna.spec 3 Nov 2012 19:51:04 -0000 1.7
@@ -1,6 +1,6 @@
Name: minidlna
Version: 1.0.25
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
@@ -13,6 +13,9 @@
Source2: %{name}-1.0.24-debian-manpages.tar.gz
# tmpfiles.d configuration for the /var/run directory
Source3: %{name}-tmpfiles.conf
+# Fix FTBFS for ffmpeg-1.0
+# http://inmmc.org/ftp/soft/minidlna.diff
+Patch0: %{name}-1.0.25-ffmpeg10.patch
BuildRequires: libuuid-devel
BuildRequires: ffmpeg-devel
@@ -42,6 +45,7 @@
%prep
%setup -q
%setup -D -T -q -a 2
+%patch0 -p1
# Honor RPM_OPT_FLAGS
sed -i 's/CFLAGS = -Wall -g -O3/CFLAGS +=/' Makefile
@@ -152,6 +156,10 @@
%changelog
+* Sat Nov 03 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.25-2
+- Fixed FTBFS caused by ffmpeg 1.0
+- Updated minidlna.service I forgot to commit (BZ #2294)
+
* Sat Jul 14 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.25-1
- Updated to upstream 1.0.25
11 years, 6 months