[ffmpeg] make xvidcore support optional
by Dominik Mierzejewski
commit 1c686737ff9ad8e2fdf08aef3c1216c1d5dc32bd
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Sat Jul 16 00:15:38 2016 +0200
make xvidcore support optional
ffmpeg.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 1b3b0e8..7bc6d7c 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -74,7 +74,7 @@ BuildRequires: subversion
BuildRequires: texinfo
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
%{!?_without_x265:BuildRequires: x265-devel}
-BuildRequires: xvidcore-devel
+%{?_with_xvid:BuildRequires: xvidcore-devel}
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
BuildRequires: yasm
@@ -160,7 +160,7 @@ This package contains development files for %{name}
%{!?_without_vpx:--enable-libvpx} \\\
%{!?_without_x264:--enable-libx264} \\\
%{!?_without_x265:--enable-libx265} \\\
- --enable-libxvid \\\
+ %{?_with_xvid:--enable-libxvid} \\\
--enable-x11grab \\\
--enable-avfilter \\\
--enable-avresample \\\
@@ -271,6 +271,7 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
- add conditional support for QSV via libmfx (rfbz#4043)
- drop libcelt support (celt 0.11 no longer available in Fedora)
- drop libdirac support (unsupported by FFmpeg)
+- make xvidcore support optional
* Thu Jul 07 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.0.2-3
- Fixed build failure on rawhide due to newer opencv using a patch from upstream
8 years, 4 months
[ffmpeg] drop libdirac support (unsupported by FFmpeg)
by Dominik Mierzejewski
commit f349d0c030b43b8d95ab4da86326bb18dc96972e
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Sat Jul 16 00:13:16 2016 +0200
drop libdirac support (unsupported by FFmpeg)
ffmpeg.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index c0e739d..1b3b0e8 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -28,7 +28,6 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
Patch0: 0001-configure-add-direct-detection-of-libopencv.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bzip2-devel
-%{?_with_dirac:BuildRequires: dirac-devel}
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
BuildRequires: freetype-devel
@@ -137,7 +136,6 @@ This package contains development files for %{name}
--enable-libass \\\
%{!?_without_cdio:--enable-libcdio} \\\
--enable-libdc1394 \\\
- %{?_with_dirac:--enable-libdirac} \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
%{?_with_fdk-aac:--enable-libfdk-aac --enable-nonfree} \\\
%{!?_without_jack:--enable-indev=jack} \\\
@@ -272,6 +270,7 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
- re-enable opencl by default (rfbz#3640 was fixed)
- add conditional support for QSV via libmfx (rfbz#4043)
- drop libcelt support (celt 0.11 no longer available in Fedora)
+- drop libdirac support (unsupported by FFmpeg)
* Thu Jul 07 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.0.2-3
- Fixed build failure on rawhide due to newer opencv using a patch from upstream
8 years, 4 months
[ffmpeg] drop libcelt support
by Dominik Mierzejewski
commit 30a5b934ee66e78d6db8d94f5c370dad336f8103
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Sat Jul 16 00:11:37 2016 +0200
drop libcelt support
celt 0.11 no longer available in Fedora
ffmpeg.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 113c73d..c0e739d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -28,7 +28,6 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
Patch0: 0001-configure-add-direct-detection-of-libopencv.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bzip2-devel
-%{?_with_celt:BuildRequires: celt-devel}
%{?_with_dirac:BuildRequires: dirac-devel}
%{?_with_faac:BuildRequires: faac-devel}
%{?_with_fdk_aac:BuildRequires: fdk-aac-devel}
@@ -137,7 +136,6 @@ This package contains development files for %{name}
%{!?_without_ladspa:--enable-ladspa} \\\
--enable-libass \\\
%{!?_without_cdio:--enable-libcdio} \\\
- %{?_with_celt:--enable-libcelt} \\\
--enable-libdc1394 \\\
%{?_with_dirac:--enable-libdirac} \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
@@ -273,6 +271,7 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
- enable jack by default (rfbz#2156)
- re-enable opencl by default (rfbz#3640 was fixed)
- add conditional support for QSV via libmfx (rfbz#4043)
+- drop libcelt support (celt 0.11 no longer available in Fedora)
* Thu Jul 07 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.0.2-3
- Fixed build failure on rawhide due to newer opencv using a patch from upstream
8 years, 4 months
[ffmpeg] add conditional support for QSV via libmfx (rfbz#4043)
by Dominik Mierzejewski
commit ba48e67ef8e16bfd88323dfe20e98f5635eadef3
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Sat Jul 16 00:09:56 2016 +0200
add conditional support for QSV via libmfx (rfbz#4043)
ffmpeg.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index a17c518..113c73d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -44,6 +44,7 @@ BuildRequires: libass-devel
#libcrystalhd is currently broken
%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
BuildRequires: libdc1394-devel
+%{?_with_mfx:BuildRequires: libmfx-devel}
Buildrequires: libmodplug-devel
%{?_with_rtmp:BuildRequires: librtmp-devel}
BuildRequires: libtheora-devel
@@ -144,6 +145,7 @@ This package contains development files for %{name}
%{!?_without_jack:--enable-indev=jack} \\\
--enable-libfreetype \\\
--enable-libgsm \\\
+ %{?_with_qsv:--enable-libmfx} \\\
--enable-libmp3lame \\\
%{?_with_nvenc:--enable-nvenc --enable-nonfree} \\\
%{!?_without_openal:--enable-openal} \\\
@@ -270,6 +272,7 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
* Sun Jul 10 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 3.0.2-4
- enable jack by default (rfbz#2156)
- re-enable opencl by default (rfbz#3640 was fixed)
+- add conditional support for QSV via libmfx (rfbz#4043)
* Thu Jul 07 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.0.2-3
- Fixed build failure on rawhide due to newer opencv using a patch from upstream
8 years, 4 months
[ffmpeg] re-enable opencl by default (rfbz#3640 was fixed)
by Dominik Mierzejewski
commit 7016e630706db58314a577f007430e2f9f457604
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Sat Jul 16 00:07:05 2016 +0200
re-enable opencl by default (rfbz#3640 was fixed)
ffmpeg.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f2bf0da..a17c518 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -57,7 +57,10 @@ BuildRequires: libXvMC-devel
%endif
%{?_with_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
%{!?_without_openal:BuildRequires: openal-soft-devel}
-%{?_with_opencl:BuildRequires: opencl-headers ocl-icd-devel}
+%if 0%{!?_without_opencl:1}
+BuildRequires: opencl-headers ocl-icd-devel
+Recommends: opencl-icd
+%endif
%{!?_without_opencv:BuildRequires: opencv-devel}
BuildRequires: openjpeg-devel
BuildRequires: opus-devel
@@ -144,7 +147,7 @@ This package contains development files for %{name}
--enable-libmp3lame \\\
%{?_with_nvenc:--enable-nvenc --enable-nonfree} \\\
%{!?_without_openal:--enable-openal} \\\
- %{?_with_opencl:--enable-opencl} \\\
+ %{!?_without_opencl:--enable-opencl} \\\
%{!?_without_opencv:--enable-libopencv} \\\
--enable-libopenjpeg \\\
--enable-libopus \\\
@@ -266,6 +269,7 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
* Sun Jul 10 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 3.0.2-4
- enable jack by default (rfbz#2156)
+- re-enable opencl by default (rfbz#3640 was fixed)
* Thu Jul 07 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.0.2-3
- Fixed build failure on rawhide due to newer opencv using a patch from upstream
8 years, 4 months
[ffmpeg] enable jack by default (rfbz#2156)
by Dominik Mierzejewski
commit d59ad3d5952aa7d2155c096b6474393da8320992
Author: Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net>
Date: Thu Jul 14 02:02:41 2016 +0200
enable jack by default (rfbz#2156)
ffmpeg.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 10e878f..f2bf0da 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -13,7 +13,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 3.0.2
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -37,7 +37,7 @@ BuildRequires: freetype-devel
BuildRequires: gnutls-devel
BuildRequires: gsm-devel
BuildRequires: lame-devel >= 3.98.3
-%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
%{!?_without_ladspa:BuildRequires: ladspa-devel}
BuildRequires: libass-devel
%{!?_without_cdio:BuildRequires: libcdio-paranoia-devel}
@@ -138,7 +138,7 @@ This package contains development files for %{name}
%{?_with_dirac:--enable-libdirac} \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
%{?_with_fdk-aac:--enable-libfdk-aac --enable-nonfree} \\\
- %{!?_with_jack:--disable-indev=jack} \\\
+ %{!?_without_jack:--enable-indev=jack} \\\
--enable-libfreetype \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
@@ -264,6 +264,9 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Sun Jul 10 2016 Dominik Mierzejewski <rpm(a)greysector.net> - 3.0.2-4
+- enable jack by default (rfbz#2156)
+
* Thu Jul 07 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.0.2-3
- Fixed build failure on rawhide due to newer opencv using a patch from upstream
git
8 years, 4 months
[Nestopia] Updated to new upstream release
by Andrea Musuruane
commit c40560399daa6c5aa7d651d708526fb8b3c3bb5b
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Fri Jul 15 22:31:53 2016 +0200
Updated to new upstream release
- Updated URL
- Added Debian man page
- Updated Debian patches
- Moved icons in %{_datadir}/icons/hicolor
.gitignore | 1 +
Nestopia-1.36-nesntsc.patch | 14 ---
Nestopia-1.45-format-security.patch | 14 ---
Nestopia-1.47-buildflags.patch | 20 ++++
Nestopia-1.47-format-security.patch | 13 +++
...n.patch => Nestopia-1.47-install-location.patch | 31 +-----
Nestopia-1.47-use-system-nes_ntsc.patch | 35 +++++++
Nestopia-1.47-use-system-zlib.patch | 14 +++
Nestopia.spec | 90 ++++++++++++++----
nestopia.6 | 105 +++++++++++++++++++++
sources | 2 +-
11 files changed, 267 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5903e7f..3189e2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
nestopia-1.45.tgz
+/nestopia-1.47.tgz
diff --git a/Nestopia-1.47-buildflags.patch b/Nestopia-1.47-buildflags.patch
new file mode 100644
index 0000000..88365cf
--- /dev/null
+++ b/Nestopia-1.47-buildflags.patch
@@ -0,0 +1,20 @@
+Description: Preserve externally-provided build flags
+Author: Stephen Kitt <skitt(a)debian.org>
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,12 +2,12 @@
+ CXX ?= c++
+ CXXFLAGS ?= -O3
+ CPPFLAGS += -DNST_PRAGMA_ONCE
+-CFLAGS = $(shell sdl2-config --cflags)
++CFLAGS += $(shell sdl2-config --cflags)
+
+ INCLUDES = -Isource
+ WARNINGS = -Wno-write-strings
+
+-LDFLAGS = -Wl,--as-needed
++LDFLAGS += -Wl,--as-needed
+ LIBS = -lstdc++ -lm -lz
+ LIBS += $(shell sdl2-config --libs)
+
diff --git a/Nestopia-1.47-format-security.patch b/Nestopia-1.47-format-security.patch
new file mode 100644
index 0000000..e5c322e
--- /dev/null
+++ b/Nestopia-1.47-format-security.patch
@@ -0,0 +1,13 @@
+Description: Use a format specifier with gtk_message_dialog_new
+Author: Stephen Kitt <skitt(a)debian.org>
+
+--- a/source/unix/gtkui/gtkui.cpp
++++ b/source/unix/gtkui/gtkui.cpp
+@@ -438,6 +438,7 @@
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
++ "%s",
+ message);
+ gtk_dialog_run(GTK_DIALOG(messagewindow));
+ gtk_widget_destroy(messagewindow);
diff --git a/Nestopia-1.45-install-location.patch b/Nestopia-1.47-install-location.patch
similarity index 71%
rename from Nestopia-1.45-install-location.patch
rename to Nestopia-1.47-install-location.patch
index 9336c47..df1af36 100644
--- a/Nestopia-1.45-install-location.patch
+++ b/Nestopia-1.47-install-location.patch
@@ -1,34 +1,13 @@
Description: Install to FHS-compliant locations and handle DESTDIR
Author: Stephen Kitt <skitt(a)debian.org>
---- nestopia.orig/Makefile
-+++ nestopia/Makefile
-@@ -4,8 +4,8 @@
- # By R. Danbrook 2012
- #
-
--CC = @gcc
--CXX = @g++
-+CC = gcc
-+CXX = g++
- CFLAGS ?= -O3 -g3
- CXXFLAGS ?= -O3 -g3
- CPPFLAGS += -DNST_PRAGMA_ONCE_SUPPORT -D_SZ_ONE_DIRECTORY
-@@ -36,8 +36,8 @@
- CPPFLAGS += -DBSD
- endif
-
--PREFIX = /usr/local
--BINDIR = $(PREFIX)/bin
-+PREFIX = /usr
-+BINDIR = $(PREFIX)/bin
- DATADIR = $(PREFIX)/share/nestopia
-
- # OpenGL Support
-@@ -190,15 +190,16 @@
- $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $^ $(LIBS)
+--- a/Makefile
++++ b/Makefile
+@@ -395,16 +395,16 @@
+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $(BIN)
install:
+- mkdir -p $(BINDIR)
- mkdir -p $(DATADIR)/icons
- mkdir -p $(PREFIX)/share/pixmaps
- install -m 0755 $(BIN) $(BINDIR)
diff --git a/Nestopia-1.47-use-system-nes_ntsc.patch b/Nestopia-1.47-use-system-nes_ntsc.patch
new file mode 100644
index 0000000..9527e01
--- /dev/null
+++ b/Nestopia-1.47-use-system-nes_ntsc.patch
@@ -0,0 +1,35 @@
+diff -durN nestopia-1.47.orig/Makefile nestopia-1.47/Makefile
+--- nestopia-1.47.orig/Makefile 2016-01-10 03:07:59.000000000 +0100
++++ nestopia-1.47/Makefile 2016-04-24 18:16:51.276901269 +0200
+@@ -374,7 +374,7 @@
+
+ # Core rules
+ objs/core/%.o: source/core/%.cpp
+- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -Isource/nes_ntsc -c $< -o $@
+
+ # Interface rules
+ objs/unix/%.o: source/unix/%.cpp
+diff -durN nestopia-1.47.orig/source/core/NstVideoFilterNtscCfg.cpp nestopia-1.47/source/core/NstVideoFilterNtscCfg.cpp
+--- nestopia-1.47.orig/source/core/NstVideoFilterNtscCfg.cpp 2016-01-10 03:07:11.000000000 +0100
++++ nestopia-1.47/source/core/NstVideoFilterNtscCfg.cpp 2016-04-24 17:44:04.532308362 +0200
+@@ -34,7 +34,6 @@
+ #endif
+
+ #define NES_NTSC_NO_BLITTERS
+-#include "../nes_ntsc/nes_ntsc.inl"
+
+ #ifdef _MSC_VER
+ #pragma warning( pop )
+diff -durN nestopia-1.47.orig/source/core/NstVideoFilterNtsc.hpp nestopia-1.47/source/core/NstVideoFilterNtsc.hpp
+--- nestopia-1.47.orig/source/core/NstVideoFilterNtsc.hpp 2016-01-10 03:07:11.000000000 +0100
++++ nestopia-1.47/source/core/NstVideoFilterNtsc.hpp 2016-04-24 17:44:27.816274653 +0200
+@@ -25,7 +25,7 @@
+ #ifndef NST_VIDEO_FILTER_NTSC_H
+ #define NST_VIDEO_FILTER_NTSC_H
+
+-#include "../nes_ntsc/nes_ntsc.h"
++#include <nes_ntsc.h>
+
+ #ifdef NST_PRAGMA_ONCE
+ #pragma once
diff --git a/Nestopia-1.47-use-system-zlib.patch b/Nestopia-1.47-use-system-zlib.patch
new file mode 100644
index 0000000..1090eaf
--- /dev/null
+++ b/Nestopia-1.47-use-system-zlib.patch
@@ -0,0 +1,14 @@
+Description: Use system zlib
+Author: Sérgio Benjamim <sergio_br2(a)yahoo.com.br>
+
+--- a/source/core/NstZlib.cpp
++++ b/source/core/NstZlib.cpp
+@@ -37,7 +37,7 @@
+
+ #endif
+
+- #include "../zlib/zlib.h"
++ #include <zlib.h>
+
+ #endif
+
diff --git a/Nestopia.spec b/Nestopia.spec
index 91d3794..494cbfc 100644
--- a/Nestopia.spec
+++ b/Nestopia.spec
@@ -1,29 +1,34 @@
%global realname nestopia
Name: Nestopia
-Version: 1.45
-Release: 2%{?dist}
+Version: 1.47
+Release: 1%{?dist}
Summary: A portable open source NES/Famicom emulator
License: GPLv2+
-URL: http://0ldsk00l.ca/nestopia.html
+URL: http://0ldsk00l.ca/nestopia/
Source0: http://downloads.sourceforge.net/nestopiaue/%{version}/%{realname}-%{vers...
+# Debian man page
+Source1: %{realname}.6
# Install to FHS-compliant locations and handle DESTDIR
-Patch0: %{name}-1.45-install-location.patch
+Patch0: %{name}-1.47-install-location.patch
# Use a format specifier with gtk_message_dialog_new
-Patch1: %{name}-1.45-format-security.patch
+Patch1: %{name}-1.47-format-security.patch
+# Preserve externally-provided build flags
+Patch2: %{name}-1.47-buildflags.patch
+# Use system zlib
+Patch3: %{name}-1.47-use-system-zlib.patch
# Use system nes_ntsc
-Patch2: Nestopia-1.36-nesntsc.patch
+Patch4: %{name}-1.47-use-system-nes_ntsc.patch
BuildRequires: gtk3-devel
-BuildRequires: SDL-devel >= 1.2.12
-BuildRequires: alsa-lib-devel
+BuildRequires: SDL2-devel
BuildRequires: libarchive-devel
BuildRequires: zlib-devel
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: nes_ntsc-devel
-BuildRequires: pkgconfig
+BuildRequires: libao-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -35,38 +40,89 @@ full support for software that do mid-scanline and other timing trickery.
%prep
%setup -q -n %{realname}-%{version}
-
%patch0 -p1
%patch1 -p1
-%patch2 -p0
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+# Link system nes_ntsc lib
+sed -i 's/ -lz/ -lz -lnes_ntsc/' Makefile
# Fix end-of-line encoding
sed -i 's/\r//' changelog.txt
-# Clean up sources
-rm -rf dll lib source/kaillera source/unrar
+# Remove bundled libs
+rm -rf source/zlib
+rm -rf source/nes_ntsc/{*.c,*.inl,demo_impl.h,nes_ntsc.h,nes_ntsc_impl.h}
%build
+# Wordaround FTBFS with GCC 6
+%global optflags %{optflags} -std=gnu++98
+
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
# It does not compile with smp_mflags
make
%install
-make install DESTDIR=%{buildroot}
+export PREFIX="%{_prefix}"
+export BINDIR="%{_bindir}"
+%make_install
# Validate desktop file
desktop-file-validate \
- $RPM_BUILD_ROOT%{_datadir}/applications/%{realname}.desktop
+ %{buildroot}%{_datadir}/applications/%{realname}.desktop
+
+# Move icon into %%{_datadir}/icons/hicolor/
+install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+mv %{buildroot}%{_datadir}/pixmaps/%{realname}.svg \
+ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+
+# Install icons
+for i in 32 48 64 96 128; do
+ install -d %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -p -m 644 source/unix/icons/%{realname}${i}.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{realname}.png
+done
+
+# Install man page
+install -d %{buildroot}%{_mandir}/man6
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man6/
+
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%{_bindir}/%{realname}
%{_datadir}/%{realname}
-%{_datadir}/pixmaps/%{realname}.svg
+%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/applications/%{realname}.desktop
-%doc changelog.txt COPYING README.unix readme.html
+%{_mandir}/man6/*
+%license COPYING
+%doc AUTHORS changelog.txt README.md README.unix readme.html
%changelog
+* Sun Apr 24 2016 Andrea Musuruane <musuruan(a)gmail.com> - 1.47-1
+- Updated to new upstream release
+- Updated URL
+- Added Debian man page
+- Updated Debian patches
+- Moved icons in %%{_datadir}/icons/hicolor
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.45-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/nestopia.6 b/nestopia.6
new file mode 100644
index 0000000..1ec17e3
--- /dev/null
+++ b/nestopia.6
@@ -0,0 +1,105 @@
+.\" Hey, EMACS: -*- nroff -*-
+.TH NESTOPIA 6 "August 11, 2011"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+nestopia \- Nintento Entertainment System / Famicom emulator
+.SH SYNOPSIS
+.B nestopia
+.IR game
+.SH DESCRIPTION
+This manual page documents briefly the
+.B nestopia
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+.B nestopia
+is an emulator for the Nintento Entertainment System. It can execute
+programs intended for the NES console.
+.SH OPTIONS
+.B nestopia
+has no command\-line options; use the provided GUI to configure it.
+.SH KEYBOARD CONTROLS
+The default controls are as follows:
+.IP Up
+Player 1 up
+.IP Down
+Player 1 down
+.IP Left
+Player one left
+.IP Right
+Player one right
+.IP ,
+Player one A
+.IP .
+Player one B
+.IP 1
+Player one start
+.IP 2
+Player one select
+.IP "Keypad 8"
+Player two up
+.IP "Keypad 2"
+Player two down
+.IP "Keypad 4"
+Player two left
+.IP "Keypad 6"
+Player two right
+.IP "Keypad /"
+Player two A
+.IP "Keypad *"
+Player two B
+.IP "Keypad Enter"
+Player two start
+.IP "Keypad +"
+Player two select
+.IP F1
+Save movie
+.IP F2
+Load movie
+.IP F3
+Stop recording movie
+.IP F4
+Reset
+.IP F5
+Flip disk
+.IP F7
+Save
+.IP F8
+Load
+.IP Escape
+Stop
+.IP Backspace
+Rewind
+.IP \\
+Fast forward
+.IP 7
+Quick save 1
+.IP 8
+Quick save 2
+.IP 9
+Quick load 1
+.IP 0
+Quick load 2
+.IP 5
+Coin 1
+.IP 6
+Coin 2
+.SH AUTHOR
+nestopia was written by Martin Freij and ported to Linux by
+R. Belmont. It is now maintained by R. Danbrook.
+.PP
+This manual page was written by Stephen Kitt <skitt(a)debian.org>,
+for the Debian project (and may be used by others).
diff --git a/sources b/sources
index 0af38ef..5ac330e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-efef045895b8eaa78ed537dbb17c04f7 nestopia-1.45.tgz
+426c22ba9d9f7a5ece227bbe1de25982 nestopia-1.47.tgz
8 years, 4 months
[qmc2] Moved to Fedora proper (#1353343)
by Julian Sikorski
commit 60cd4c75e63dd7d3b47465627494c389bf3bcc31
Author: Julian Sikorski <belegdol(a)fedoraproject.org>
Date: Thu Jul 14 22:09:25 2016 +0200
Moved to Fedora proper (#1353343)
.gitignore | 2 -
dead.package | 1 +
qmc2-ini.patch | 36 ------
qmc2.spec | 375 ---------------------------------------------------------
sources | 1 -
5 files changed, 1 insertion(+), 414 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..9b596d0
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Moved to Fedora proper (#1353343)
8 years, 4 months
