rpms/bsnes/F-14 bsnes-0.072-nocheats.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 bsnes.spec, 1.39, 1.40 sources, 1.28, 1.29 bsnes-0.070-nogconftool.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22662
Modified Files:
.cvsignore bsnes.spec sources
Added Files:
bsnes-0.072-nocheats.patch
Removed Files:
bsnes-0.070-nogconftool.patch
Log Message:
* Sun Nov 21 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.072-1
- Updated to 0.072
- Dropped gconf patch, added cheats one
bsnes-0.072-nocheats.patch:
Makefile | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE bsnes-0.072-nocheats.patch ---
diff -up bsnes-0.072/bsnes/Makefile.nocheats bsnes-0.072/bsnes/Makefile
--- bsnes-0.072/bsnes/Makefile.nocheats 2010-11-17 22:46:25.000000000 +0100
+++ bsnes-0.072/bsnes/Makefile 2010-11-17 22:49:08.000000000 +0100
@@ -64,9 +64,6 @@ ifeq ($(platform),x)
install -D -m 755 out/bsnes $(DESTDIR)$(prefix)/bin/bsnes
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
- test -d ~/.bsnes || mkdir ~/.bsnes
- cp data/cheats.xml ~/.bsnes/cheats.xml
- chmod 777 ~/.bsnes ~/.bsnes/cheats.xml
endif
uninstall:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-14/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 29 Sep 2010 17:49:58 -0000 1.28
+++ .cvsignore 21 Nov 2010 19:39:52 -0000 1.29
@@ -1 +1 @@
-bsnes_v070.tar.bz2
+bsnes_v072.tar.bz2
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-14/bsnes.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- bsnes.spec 29 Sep 2010 21:25:15 -0000 1.39
+++ bsnes.spec 21 Nov 2010 19:39:52 -0000 1.40
@@ -1,4 +1,4 @@
-%global vernumber 070
+%global vernumber 072
Name: bsnes
Version: 0.%{vernumber}
@@ -10,7 +10,7 @@
URL: http://byuu.org/bsnes/
Source0: http://bsnes.googlecode.com/files/%{name}_v%{vernumber}.tar.bz2
Source2: README.bsnes
-Patch0: bsnes-0.070-nogconftool.patch
+Patch0: bsnes-0.072-nocheats.patch
Patch1: bsnes-0.068-newppcelf.patch
Patch2: bsnes-0.068-noppcelfppc64.patch
Patch3: bsnes-0.064-systemlibs.patch
@@ -65,7 +65,7 @@
%prep
%setup -qc
-%patch0 -p1 -b .nogconftool
+%patch0 -p1 -b .nocheats
%patch1 -p1 -b .newppcelf
%patch2 -p1 -b .noppcelfppc64
%patch3 -p1 -b .systemlibs
@@ -102,12 +102,12 @@
for sourcedir in snesfilter snesreader supergameboy
do
pushd $sourcedir
- make %{?_smp_mflags} moc=moc-qt4
+ make %{?_smp_mflags} moc=moc-qt4 compiler=gcc
popd
done
pushd bsnes
-make %{?_smp_mflags} platform=x compiler=gcc moc=moc-qt4
+make %{?_smp_mflags} platform=x compiler=gcc moc=moc-qt4 profile=compatibility ui=ui-qt
%install
@@ -173,6 +173,10 @@
%changelog
+* Sun Nov 21 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.072-1
+- Updated to 0.072
+- Dropped gconf patch, added cheats one
+
* Wed Sep 29 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.070-1
- Updated to 0.070
- Don't change the way menus look
Index: sources
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-14/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 29 Sep 2010 17:49:58 -0000 1.28
+++ sources 21 Nov 2010 19:39:52 -0000 1.29
@@ -1 +1 @@
-d7977e140abc9f07fe55c3ae420bc281 bsnes_v070.tar.bz2
+dcbd0f2a88682fb25d409a8276576983 bsnes_v072.tar.bz2
--- bsnes-0.070-nogconftool.patch DELETED ---
13 years, 5 months
rpms/avidemux/F-14 avidemux_2.5.4-ffmpeg-aac.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 avidemux.spec, 1.37, 1.38 sources, 1.7, 1.8 2.5.3_mjpeg_fix.diff, 1.1, NONE avidemux-2.5.3-field-asm-fix.diff, 1.1, NONE avidemux_2.5.3-ffmpeg-aac.patch, 1.1, NONE
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8359
Modified Files:
.cvsignore avidemux.spec sources
Added Files:
avidemux_2.5.4-ffmpeg-aac.patch
Removed Files:
2.5.3_mjpeg_fix.diff avidemux-2.5.3-field-asm-fix.diff
avidemux_2.5.3-ffmpeg-aac.patch
Log Message:
* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.4-1
- Update to 2.5.4
- Fix Qt translations (Kevin Kofler)
avidemux_2.5.4-ffmpeg-aac.patch:
CMakeLists.txt | 9 +++++++++
audioencoder_lavcodec.cpp | 21 ++++++++++++++++-----
2 files changed, 25 insertions(+), 5 deletions(-)
--- NEW FILE avidemux_2.5.4-ffmpeg-aac.patch ---
diff -ur avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp avidemux_2.5.4-ffmpeg-aac/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
--- avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp.ffmpegaac 2010-05-25 16:48:57.000000000 -0400
+++ avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2010-11-20 16:26:36.756237795 -0500
@@ -25,13 +25,16 @@
#include "ADM_lavcodec.h"
#define Join(x,y) x##_##y
-#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3)
+#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,MP2)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_MP2
#else
- #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3)
+ #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC)
#define makeName(x) Join(x,AC3)
#define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AC3
+ #elif !defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && defined(ADM_LAV_AAC)
+ #define makeName(x) Join(x,AAC)
+ #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AAC
#else
#error
#endif
@@ -60,13 +63,19 @@
2, // Max channels
1,0,0, // Version
#else
-
-
+#ifdef ADM_LAV_AC3
"LavAC3",
"AC3 (lav)",
"AC3 LavEncoder encoder plugin Mean 2008",
6, // Max channels
1,0,0, // Version
+#else
+ "LavAAC",
+ "AAC (lav)",
+ "AAC LavEncoder encoder plugin Mean 2008",
+ 6, // Max channels
+ 1,0,0, // Version
+#endif
#endif
makeName(WAV),
@@ -132,7 +141,9 @@
#endif
_wavheader->byterate=(lavConfig.bitrate*1000)>>3;
-#ifdef ADM_LAV_MP2
+#if defined(ADM_LAV_AAC)
+ _chunk = 1024*_wavheader->channels;
+#elif defined(ADM_LAV_MP2)
_chunk = 1152*_wavheader->channels;
#else
_chunk = 1536*_wavheader->channels; // AC3
diff -ur avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt avidemux_2.5.4-ffmpeg-aac/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt
--- avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt.ffmpegaac 2010-05-25 16:48:57.000000000 -0400
+++ avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2010-11-20 16:24:10.171164293 -0500
@@ -27,3 +27,12 @@
INIT_AUDIO_ENCODER(ADM_ae_lav_ac3)
INSTALL_AUDIOENCODER(ADM_ae_lav_ac3)
+
+ SET(ADM_ae_lav_aac_SRCS audioencoder_lavcodec.cpp)
+
+ ADD_LIBRARY(ADM_ae_lav_aac SHARED ${ADM_ae_lav_aac_SRCS})
+ ADD_TARGET_CFLAGS(ADM_ae_lav_aac "-DADM_LAV_AAC")
+ TARGET_LINK_LIBRARIES(ADM_ae_lav_aac ADM_core ADM_coreAudio ADM_coreUI ADM_libavcodec ADM_libavutil)
+
+ INIT_AUDIO_ENCODER(ADM_ae_lav_aac)
+ INSTALL_AUDIOENCODER(ADM_ae_lav_aac)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 27 May 2010 02:05:51 -0000 1.7
+++ .cvsignore 20 Nov 2010 23:55:16 -0000 1.8
@@ -1 +1 @@
-avidemux_2.5.3.tar.gz
+avidemux_2.5.4.tar.gz
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- avidemux.spec 5 Nov 2010 16:35:59 -0000 1.37
+++ avidemux.spec 20 Nov 2010 23:55:16 -0000 1.38
@@ -1,8 +1,8 @@
%define _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.5.3
-Release: 6%{?dist}
+Version: 2.5.4
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -33,17 +33,12 @@
Patch2: avidemux-2.4-qt4.patch
# Prevents avidemux from creating the symlinks for .so files, which we do below
Patch3: avidemux-2.5.3-tmplinktarget.patch
-# Fixes multiple definitions of mjpeg_log
-# http://fixounet.free.fr/2.6/2.5.3_mjpeg_fix.diff
-Patch4: 2.5.3_mjpeg_fix.diff
# libADM_xvidRateCtl.so and libADM_vidEnc_pluginOptions.so are supposed to be
# build statically according to upstream... Let's get them installed instead
-Patch5: avidemux-2.5.3-mpeg2enc.patch
-Patch6: avidemux-2.5.3-pluginlibs.patch
-# Patch7 obtained from http://fixounet.free.fr/2.6/2.5.3_field_asm_fix.diff
-Patch7: avidemux-2.5.3-field-asm-fix.diff
+Patch4: avidemux-2.5.3-mpeg2enc.patch
+Patch5: avidemux-2.5.3-pluginlibs.patch
# Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00...
-Patch8: avidemux_2.5.3-ffmpeg-aac.patch
+Patch6: avidemux_2.5.4-ffmpeg-aac.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
@@ -56,6 +51,7 @@
# Compiling
BuildRequires: cmake
BuildRequires: gettext-devel
+BuildRequires: libxslt
# Libraries
BuildRequires: yasm-devel
@@ -175,11 +171,9 @@
%patch1 -p1 -b .pulse
%patch2 -p1 -b .qt4
%patch3 -p1 -b .tmplinktarget
-%patch4 -p1 -b .mjpeg_log
-%patch5 -p1 -b .mpeg2enc
-%patch6 -p1 -b .pluginlibs
-%patch7 -p1 -b .x264asm
-%patch8 -p1 -b .ffmpegaac
+%patch4 -p1 -b .mpeg2enc
+%patch5 -p1 -b .pluginlibs
+%patch6 -p1 -b .ffmpegaac
%build
# Out of source build
@@ -216,6 +210,11 @@
# Find and remove all la files
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+# Remove Windows-only executables
+# Must check this for new Linux-relevant files upon new avidemux releases
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ADM_addons/avsfilter
+rmdir $RPM_BUILD_ROOT%{_datadir}/ADM_addons/
+
# Install .desktop shortcuts
desktop-file-install --vendor rpmfusion \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -225,6 +224,15 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
+# Remove duplicated Qt translations
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n/qt_*.qm
+# find_lang.sh doesn't recognize this one, and there already is avidemux_sr.qm
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n/avidemux_sr(a)latin.qm
+
+# Qt-style translations
+%find_lang %{name} --with-qt --without-mo
+mv -f %{name}.lang %{name}-qt.lang
+# Gettext-style translations
%find_lang %{name}
%clean
@@ -237,7 +245,7 @@
%defattr(-,root,root,-)
# metapackage, no files
-%files libs -f %{name}.lang
+%files libs
%doc AUTHORS COPYING README TODO
%{_datadir}/ADM_scripts/
%{_datadir}/pixmaps/avidemux.png
@@ -247,16 +255,16 @@
%defattr(-,root,root,-)
%{_bindir}/avidemux2_cli
-%files gtk
+%files gtk -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/avidemux2_gtk
%{_datadir}/applications/*gtk*.desktop
-%files qt
+%files qt -f %{name}-qt.lang
%defattr(-,root,root,-)
-%{_datadir}/%{name}/i18n/
%{_bindir}/avidemux2_qt4
%{_datadir}/applications/*qt*.desktop
+%dir %{_datadir}/%{name}/i18n
%files plugins
%defattr(-,root,root,-)
@@ -267,6 +275,10 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.4-1
+- Update to 2.5.4
+- Fix Qt translations (Kevin Kofler)
+
* Fri Nov 5 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-6
- Remove dir /usr/share/avidemux as nothing installs there anymore
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 27 May 2010 02:05:52 -0000 1.7
+++ sources 20 Nov 2010 23:55:16 -0000 1.8
@@ -1 +1 @@
-5a688029895b66b65ca86b7c85a03ee3 avidemux_2.5.3.tar.gz
+b849460f6480df92bfd72d1a3dc288d4 avidemux_2.5.4.tar.gz
--- 2.5.3_mjpeg_fix.diff DELETED ---
--- avidemux-2.5.3-field-asm-fix.diff DELETED ---
--- avidemux_2.5.3-ffmpeg-aac.patch DELETED ---
13 years, 5 months
rpms/catalyst-kmod/F-13 .cvsignore, 1.8, 1.9 catalyst-kmod.spec, 1.18, 1.19 sources, 1.7, 1.8
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/catalyst-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7482
Modified Files:
.cvsignore catalyst-kmod.spec sources
Log Message:
* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 10.11-1
- Update to Catalyst 10.11 (internal version 8.79.1)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 26 Oct 2010 01:38:42 -0000 1.8
+++ .cvsignore 20 Nov 2010 23:44:05 -0000 1.9
@@ -1 +1 @@
-catalyst-kmod-data-10.10.tar.bz2
+catalyst-kmod-data-10.11.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-13/catalyst-kmod.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- catalyst-kmod.spec 26 Oct 2010 01:38:42 -0000 1.18
+++ catalyst-kmod.spec 20 Nov 2010 23:44:05 -0000 1.19
@@ -12,7 +12,7 @@
%endif
Name: catalyst-kmod
-Version: 10.10
+Version: 10.11
Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
@@ -97,6 +97,9 @@
%changelog
+* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 10.11-1
+- Update to Catalyst 10.11 (internal version 8.79.1)
+
* Mon Oct 25 2010 Stewart Adam <s.adam at diffingo.com> - 10.10-1
- Update to Catalyst 10.10 (internal version 8.78.3)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-13/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 26 Oct 2010 01:38:42 -0000 1.7
+++ sources 20 Nov 2010 23:44:05 -0000 1.8
@@ -1 +1 @@
-9011c560536b1fb4f2db3e118088b290 catalyst-kmod-data-10.10.tar.bz2
+8fc739842af1c7475e8e5b99c03e6648 catalyst-kmod-data-10.11.tar.bz2
13 years, 5 months
rpms/xorg-x11-drv-catalyst/F-13 .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 xorg-x11-drv-catalyst.spec, 1.5, 1.6
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7447
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 10.11-1
- Update to Catalyst 10.11 (internal version 8.79.1)
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 26 Oct 2010 01:37:44 -0000 1.7
+++ .cvsignore 20 Nov 2010 23:44:03 -0000 1.8
@@ -1 +1 @@
-ati-driver-installer-10-10-x86.x86_64.run
+ati-driver-installer-10-11-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 26 Oct 2010 01:37:44 -0000 1.6
+++ sources 20 Nov 2010 23:44:03 -0000 1.7
@@ -1 +1 @@
-d8e6b65b2e5e18b834287eb79cf086b3 ati-driver-installer-10-10-x86.x86_64.run
+e2304b649b0894e3a904cd0c45bfbcc3 ati-driver-installer-10-11-x86.x86_64.run
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-catalyst.spec 26 Oct 2010 01:37:44 -0000 1.5
+++ xorg-x11-drv-catalyst.spec 20 Nov 2010 23:44:03 -0000 1.6
@@ -7,13 +7,13 @@
%endif
Name: xorg-x11-drv-catalyst
-Version: 10.10
+Version: 10.11
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
@@ -329,6 +329,9 @@
%{_includedir}/fglrx/
%changelog
+* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 10.11-1
+- Update to Catalyst 10.11 (internal version 8.79.1)
+
* Mon Oct 25 2010 Stewart Adam <s.adam at diffingo.com> - 10.10-1
- Update to Catalyst 10.10 (internal version 8.78.3)
13 years, 5 months
rpms/dvdstyler/F-14 dvdstyler-wxVillaLib-libjpeg.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 dvdstyler.spec, 1.11, 1.12 sources, 1.8, 1.9 dvdstyler-1.7.4-autoconf.patch, 1.1, NONE
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/dvdstyler/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6258
Modified Files:
.cvsignore dvdstyler.spec sources
Added Files:
dvdstyler-wxVillaLib-libjpeg.patch
Removed Files:
dvdstyler-1.7.4-autoconf.patch
Log Message:
* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.1-1
- Update to 1.8.1
- Merge change from F-13: Remove some of the outdated Requires and BuildRequires
dvdstyler-wxVillaLib-libjpeg.patch:
Makefile.am | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE dvdstyler-wxVillaLib-libjpeg.patch ---
--- src/Makefile.am.orig 2010-05-03 02:06:41.000000000 -0400
+++ src/Makefile.am 2010-11-20 18:07:52.380692993 -0500
@@ -9,6 +9,7 @@
AM_CXXFLAGS = @CXXFLAGS@ -I..
LDADD = ../wxVillaLib/libwxvilla.a
+AM_LDFLAGS = @LDFLAGS@ -ljpeg
EXTRA_DIST = dvdvml.l dvdvmy.y
MAINTAINERCLEANFILES = dvdvml.c dvdvmy.c dvdvmy.h
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-14/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 24 Oct 2009 04:53:15 -0000 1.7
+++ .cvsignore 20 Nov 2010 23:28:24 -0000 1.8
@@ -1 +1 @@
-DVDStyler-1.7.4.tar.bz2
+DVDStyler-1.8.1.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-14/dvdstyler.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dvdstyler.spec 24 Oct 2009 04:53:15 -0000 1.11
+++ dvdstyler.spec 20 Nov 2010 23:28:24 -0000 1.12
@@ -1,6 +1,6 @@
Name: dvdstyler
Epoch: 1
-Version: 1.7.4
+Version: 1.8.1
Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
@@ -9,21 +9,18 @@
URL: http://www.dvdstyler.de/
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
Patch0: dvdstyler-make-desktopfile-valid.patch
-# Patch from http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-video/dv...
-# Fixes translation compile issue
-Patch1: dvdstyler-1.7.4-autoconf.patch
+Patch1: dvdstyler-wxVillaLib-libjpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# build
-BuildRequires: automake, autoconf, gettext
+BuildRequires: automake, autoconf
+BuildRequires: gettext
+BuildRequires: byacc
# libraries
BuildRequires: wxGTK-devel >= 2.6.3
BuildRequires: wxsvg-devel >= 1.0-6
BuildRequires: ffmpeg-devel
BuildRequires: libgnomeui-devel
-BuildRequires: zip
# mpeg
-BuildRequires: mpgtx
-BuildRequires: mjpegtools
BuildRequires: dvdauthor
# iso/burn
BuildRequires: mkisofs
@@ -31,17 +28,17 @@
#images
BuildRequires: libjpeg-devel
BuildRequires: libexif-devel
-BuildRequires: netpbm-progs
-# finally
-BuildRequires: desktop-file-utils
+# documentation
+BuildRequires: zip
BuildRequires: xmlto
+BuildRequires: desktop-file-utils
+
Requires: dvd+rw-tools
Requires: dvdauthor
Requires: mjpegtools
Requires: mkisofs
Requires: mpgtx
-Requires: netpbm-progs
Requires: wxsvg >= 1.0-6
# note: do not add Require: totem-backend or another DVD player - see
# RPM Fusion bug 366 for more details
@@ -55,11 +52,11 @@
%prep
%setup -q -n DVDStyler-%{version}
%patch0 -b .validdesktop
-%patch1 -p0 -b .autoconf
+%patch1 -b .libjpeg
%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
%build
-#./autogen.sh
+./autogen.sh
%configure \
--disable-dependency-tracking
# docs folder is not smp_mflags safe
@@ -95,6 +92,10 @@
%{_mandir}/*/*.gz
%changelog
+* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.1-1
+- Update to 1.8.1
+- Merge change from F-13: Remove some of the outdated Requires and BuildRequires
+
* Sat Oct 24 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.4-1
- Update to 1.7.4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-14/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 24 Oct 2009 04:53:15 -0000 1.8
+++ sources 20 Nov 2010 23:28:24 -0000 1.9
@@ -1 +1 @@
-874972691bd342caf6b1415625816d1d DVDStyler-1.7.4.tar.bz2
+076bd95e15912c1c0f7f9165d0ea5632 DVDStyler-1.8.1.tar.bz2
--- dvdstyler-1.7.4-autoconf.patch DELETED ---
13 years, 5 months
rpms/dvdstyler/F-13 dvdstyler-wxVillaLib-libjpeg.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 dvdstyler.spec, 1.14, 1.15 sources, 1.9, 1.10 dvdstyler-1.8-libjpeg.patch, 1.1, NONE dvdstyler-1.8-template-subdir.patch, 1.1, NONE
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/dvdstyler/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6152
Modified Files:
.cvsignore dvdstyler.spec sources
Added Files:
dvdstyler-wxVillaLib-libjpeg.patch
Removed Files:
dvdstyler-1.8-libjpeg.patch
dvdstyler-1.8-template-subdir.patch
Log Message:
* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.1-1
- Update to 1.8.1
dvdstyler-wxVillaLib-libjpeg.patch:
Makefile.am | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE dvdstyler-wxVillaLib-libjpeg.patch ---
--- src/Makefile.am.orig 2010-05-03 02:06:41.000000000 -0400
+++ src/Makefile.am 2010-11-20 18:07:52.380692993 -0500
@@ -9,6 +9,7 @@
AM_CXXFLAGS = @CXXFLAGS@ -I..
LDADD = ../wxVillaLib/libwxvilla.a
+AM_LDFLAGS = @LDFLAGS@ -ljpeg
EXTRA_DIST = dvdvml.l dvdvmy.y
MAINTAINERCLEANFILES = dvdvml.c dvdvmy.c dvdvmy.h
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 19 May 2010 19:47:28 -0000 1.8
+++ .cvsignore 20 Nov 2010 23:28:12 -0000 1.9
@@ -1 +1 @@
-DVDStyler-1.8.0.3.tar.bz2
+DVDStyler-1.8.1.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-13/dvdstyler.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dvdstyler.spec 29 May 2010 20:01:04 -0000 1.14
+++ dvdstyler.spec 20 Nov 2010 23:28:12 -0000 1.15
@@ -1,7 +1,7 @@
Name: dvdstyler
Epoch: 1
-Version: 1.8.0.3
-Release: 2%{?dist}
+Version: 1.8.1
+Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -9,11 +9,12 @@
URL: http://www.dvdstyler.de/
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
Patch0: dvdstyler-make-desktopfile-valid.patch
-Patch1: dvdstyler-1.8-libjpeg.patch
-Patch2: dvdstyler-1.8-template-subdir.patch
+Patch1: dvdstyler-wxVillaLib-libjpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# build
-BuildRequires: automake, autoconf, gettext
+BuildRequires: automake, autoconf
+BuildRequires: gettext
+BuildRequires: byacc
# libraries
BuildRequires: wxGTK-devel >= 2.6.3
BuildRequires: wxsvg-devel >= 1.0-6
@@ -50,9 +51,8 @@
%prep
%setup -q -n DVDStyler-%{version}
-%patch0 -b .nonvalid
+%patch0 -b .validdesktop
%patch1 -b .libjpeg
-%patch2 -b .templates
%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
%build
@@ -92,6 +92,9 @@
%{_mandir}/*/*.gz
%changelog
+* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.1-1
+- Update to 1.8.1
+
* Sat May 29 2010 Stewart Adam <s.adam at diffingo.com> - 1:1.8.0.3-2
- Link against libjpeg
- Package the template files
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-13/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 19 May 2010 19:47:28 -0000 1.9
+++ sources 20 Nov 2010 23:28:12 -0000 1.10
@@ -1 +1 @@
-4663f7036b0256d28ed745ed95e9736a DVDStyler-1.8.0.3.tar.bz2
+076bd95e15912c1c0f7f9165d0ea5632 DVDStyler-1.8.1.tar.bz2
--- dvdstyler-1.8-libjpeg.patch DELETED ---
--- dvdstyler-1.8-template-subdir.patch DELETED ---
13 years, 5 months
rpms/wxsvg/F-13 .cvsignore,1.4,1.5 sources,1.4,1.5
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/wxsvg/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5695
Modified Files:
.cvsignore sources
Log Message:
Forgot to copy over source/.cvsignore for F-13
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 19 May 2010 19:47:20 -0000 1.4
+++ .cvsignore 20 Nov 2010 23:24:57 -0000 1.5
@@ -1 +1 @@
-wxsvg-1.0.4.tar.bz2
+wxsvg-1.0.7_1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 19 May 2010 19:47:20 -0000 1.4
+++ sources 20 Nov 2010 23:24:57 -0000 1.5
@@ -1 +1 @@
-24714f1bd0735b7b2ad43367d5d944c2 wxsvg-1.0.4.tar.bz2
+85561818c13d93d645f6adf905d468dd wxsvg-1.0.7_1.tar.bz2
13 years, 5 months
rpms/wxsvg/F-13 wxsvg.spec,1.5,1.6
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/wxsvg/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5140/F-13
Modified Files:
wxsvg.spec
Log Message:
* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1.0.7_1-1
- Update to 1.0.7_1 release
Index: wxsvg.spec
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-13/wxsvg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wxsvg.spec 19 May 2010 19:43:52 -0000 1.5
+++ wxsvg.spec 20 Nov 2010 23:16:27 -0000 1.6
@@ -1,5 +1,5 @@
Name: wxsvg
-Version: 1.0.4
+Version: 1.0.7_1
Release: 1%{?dist}
Summary: C++ library to create, manipulate and render SVG files
@@ -7,7 +7,6 @@
License: wxWidgets
URL: http://www.wxsvg.org/
Source0: http://downloads.sourceforge.net/wxsvg/wxsvg-%{version}.tar.bz2
-Patch0: wxsvg-1.0-ffmpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool, gettext
BuildRequires: expat-devel
@@ -32,7 +31,6 @@
%prep
%setup -q -n wxsvg-%{version}
-%patch0 -b .avformat
%build
./autogen.sh
@@ -70,8 +68,12 @@
%{_libdir}/*.so
%{_includedir}/wxSVG/
%{_includedir}/wxSVGXML/
+%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1.0.7_1-1
+- Update to 1.0.7_1 release
+
* Wed May 19 2010 Stewart Adam <s.adam at diffingo.com> - 1.0.4-1
- Update to 1.0.4 release
13 years, 5 months
rpms/wxsvg/F-14 wxsvg.spec, 1.5, 1.6 wxsvg-1.0-internal_expat.patch, 1.1, NONE
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/wxsvg/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5140/F-14
Modified Files:
wxsvg.spec
Removed Files:
wxsvg-1.0-internal_expat.patch
Log Message:
* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1.0.7_1-1
- Update to 1.0.7_1 release
Index: wxsvg.spec
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-14/wxsvg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wxsvg.spec 20 Nov 2010 23:13:11 -0000 1.5
+++ wxsvg.spec 20 Nov 2010 23:16:27 -0000 1.6
@@ -7,7 +7,6 @@
License: wxWidgets
URL: http://www.wxsvg.org/
Source0: http://downloads.sourceforge.net/wxsvg/wxsvg-%{version}.tar.bz2
-Patch0: wxsvg-1.0-ffmpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool, gettext
BuildRequires: expat-devel
--- wxsvg-1.0-internal_expat.patch DELETED ---
13 years, 5 months
rpms/wxsvg/F-14 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wxsvg.spec, 1.4, 1.5
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/wxsvg/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4679
Modified Files:
.cvsignore sources wxsvg.spec
Log Message:
* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1.0.7_1-1
- Update to 1.0.7_1 release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-14/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 18 Jan 2010 21:12:59 -0000 1.3
+++ .cvsignore 20 Nov 2010 23:13:11 -0000 1.4
@@ -1 +1 @@
-wxsvg-1.0.2_1.tar.bz2
+wxsvg-1.0.7_1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-14/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 18 Jan 2010 21:12:59 -0000 1.3
+++ sources 20 Nov 2010 23:13:11 -0000 1.4
@@ -1 +1 @@
-84122c8782bc5c2a3006501b2e76be12 wxsvg-1.0.2_1.tar.bz2
+85561818c13d93d645f6adf905d468dd wxsvg-1.0.7_1.tar.bz2
Index: wxsvg.spec
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-14/wxsvg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wxsvg.spec 18 Jan 2010 21:10:12 -0000 1.4
+++ wxsvg.spec 20 Nov 2010 23:13:11 -0000 1.5
@@ -1,5 +1,5 @@
Name: wxsvg
-Version: 1.0.2_1
+Version: 1.0.7_1
Release: 1%{?dist}
Summary: C++ library to create, manipulate and render SVG files
@@ -7,8 +7,7 @@
License: wxWidgets
URL: http://www.wxsvg.org/
Source0: http://downloads.sourceforge.net/wxsvg/wxsvg-%{version}.tar.bz2
-Patch0: wxsvg-1.0-internal_expat.patch
-Patch1: wxsvg-1.0-ffmpeg.patch
+Patch0: wxsvg-1.0-ffmpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool, gettext
BuildRequires: expat-devel
@@ -33,9 +32,6 @@
%prep
%setup -q -n wxsvg-%{version}
-%patch0 -b .expat
-%patch1 -b .avformat
-%{__rm} -rf src/svgxml/expat
%build
./autogen.sh
@@ -73,8 +69,12 @@
%{_libdir}/*.so
%{_includedir}/wxSVG/
%{_includedir}/wxSVGXML/
+%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 1.0.7_1-1
+- Update to 1.0.7_1 release
+
* Mon Jan 18 2010 Stewart Adam <s.adam at diffingo.com> - 1.0.2_1-1
- Update to 1.0.2_1 release
13 years, 5 months