[abuse] Rebase to now github upstream, which calls itself version 0.9 0.9 uses SDL2 instead of SDL-1.2 Fix a
by jwrdegoede
commit 55feb02626476f395cb510a802f9ddf08f0c5775
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Mon Feb 26 19:34:55 2018 +0100
Rebase to now github upstream, which calls itself version 0.9
0.9 uses SDL2 instead of SDL-1.2
Fix abuse crashing at startup, making it playable again (rf#4276)
Modernize spec file a bit
.gitignore | 1 +
...ointer-deref-when-built-with-gcc-O1-or-O2.patch | 91 ++++++++++++++++++++++
abuse.desktop | 3 +-
abuse.spec | 71 +++++++++--------
sources | 1 +
5 files changed, 135 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7a3ab3..ef3128f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
abuse-0.8.tar.gz
+/abuse-3c674b1.tar.gz
diff --git a/0001-Fix-NULL-pointer-deref-when-built-with-gcc-O1-or-O2.patch b/0001-Fix-NULL-pointer-deref-when-built-with-gcc-O1-or-O2.patch
new file mode 100644
index 0000000..afac196
--- /dev/null
+++ b/0001-Fix-NULL-pointer-deref-when-built-with-gcc-O1-or-O2.patch
@@ -0,0 +1,91 @@
+From 77a34f69569815e73b95d99268fb7ba1cd64c17b Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede(a)redhat.com>
+Date: Mon, 26 Feb 2018 18:28:17 +0100
+Subject: [PATCH] Fix NULL pointer deref when built with gcc -O1 or -O2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The C++ spec says "this" is always NON-NULL, recent versions of gcc will warn
+about this and optimizes the "if (this)" we use in some places away:
+"warning: nonnull argument ‘this’ compared to NULL [-Wnonnull-compare]"
+
+We rely on "if (this)" checks in several places and refactoring this
+is non trivial, so this commit adds a workaround using a helper function
+for (this == NULL) checks which is marked as __attribute__((optimize("O0")))
+when building with gcc.
+
+Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
+---
+ src/lisp/lisp.cpp | 6 +++---
+ src/lisp/lisp.h | 23 ++++++++++++++++++++++-
+ 2 files changed, 25 insertions(+), 4 deletions(-)
+
+diff --git a/src/lisp/lisp.cpp b/src/lisp/lisp.cpp
+index 363d310..8e604bf 100644
+--- a/src/lisp/lisp.cpp
++++ b/src/lisp/lisp.cpp
+@@ -860,7 +860,7 @@ size_t LList::GetLength()
+ size_t ret = 0;
+
+ #ifdef TYPE_CHECKING
+- if (this && item_type(this) != (ltype)L_CONS_CELL)
++ if (item_type(this) != (ltype)L_CONS_CELL)
+ {
+ Print();
+ lbreak(" is not a sequence\n");
+@@ -1268,7 +1268,7 @@ void LObject::Print()
+ switch (item_type(this))
+ {
+ case L_CONS_CELL:
+- if (!this)
++ if (ptr_is_null(this))
+ {
+ lprint_string("nil");
+ }
+@@ -3068,7 +3068,7 @@ LObject *LObject::Eval()
+
+ LObject *ret = NULL;
+
+- if (this)
++ if (!ptr_is_null(this))
+ {
+ switch (item_type(this))
+ {
+diff --git a/src/lisp/lisp.h b/src/lisp/lisp.h
+index 2c68bee..d1e2183 100644
+--- a/src/lisp/lisp.h
++++ b/src/lisp/lisp.h
+@@ -250,7 +250,28 @@ private:
+
+ static inline LObject *&CAR(void *x) { return ((LList *)x)->m_car; }
+ static inline LObject *&CDR(void *x) { return ((LList *)x)->m_cdr; }
+-static inline ltype item_type(void *x) { if (x) return *(ltype *)x; return L_CONS_CELL; }
++
++#ifdef __GNUC__
++/*
++ * C++ spec says "this" is always NON-NULL, recent versions of gcc will warn
++ * about this and optimizes the "if (this)" we use in some places away:
++ * "warning: nonnull argument ‘this’ compared to NULL [-Wnonnull-compare]"
++ * We rely on "if (this)" checks in several places and refactoring this is
++ * non trivial. So we use this little helper marked with
++ * __attribute__((optimize("O0"))) to workaround this.
++ */
++static inline bool __attribute__((optimize("O0"))) ptr_is_null(void *ptr)
++{
++ return ptr == NULL;
++}
++#else
++static inline bool ptr_is_null(void *ptr)
++{
++ return ptr == NULL;
++}
++#endif
++
++static inline ltype item_type(void *x) { if (!ptr_is_null(x)) return *(ltype *)x; return L_CONS_CELL; }
+
+ void perm_space();
+ void tmp_space();
+--
+2.14.3
+
diff --git a/abuse.desktop b/abuse.desktop
index f9e613e..e5721d0 100644
--- a/abuse.desktop
+++ b/abuse.desktop
@@ -1,8 +1,9 @@
[Desktop Entry]
Name=Abuse
Comment=Dark 2D side-scrolling platform game
-Exec=abuse -fullscreen -datadir /usr/share/abuse
+Exec=abuse -datadir /usr/share/games/abuse
Icon=abuse
Terminal=false
Type=Application
Categories=Game;ArcadeGame;ActionGame;
+Keywords=game;arcade;run;gun;shooter;
diff --git a/abuse.spec b/abuse.spec
index 677e001..3e48ed7 100644
--- a/abuse.spec
+++ b/abuse.spec
@@ -1,8 +1,10 @@
+%global commit 3c674b19c6ccb5fe4943658f41bb188a8dd19d5c
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
Name: abuse
-Version: 0.8
-Release: 8%{?dist}
+Version: 0.9
+Release: 1%{?dist}
Summary: The classic Crack-Dot-Com game
-Group: Amusements/Games
# The engine is GPLv2+, the data files are mostly in the public domain, except
# for the music and sfx files, which may be distributed freely, but not
# modified, and for the claudio addon, which states: "this ... can be used and
@@ -10,62 +12,69 @@ Group: Amusements/Games
# depends heavily on the claudio addon now a days, so it cannot be removed.
License: GPLv2+ and redistributable
URL: http://abuse.zoy.org/
-Source0: http://abuse.zoy.org/raw-attachment/wiki/download/%{name}-%{version}.tar.gz
-Source1: %{name}.png
-Source2: %{name}.desktop
-BuildRequires: SDL-devel SDL_mixer-devel alsa-lib-devel libGLU-devel
-BuildRequires: desktop-file-utils ImageMagick
+Source0: https://github.com/Xenoveritas/%{name}/archive/%{commit}/%{name}-%{shortc...
+# We use the original 0.8 sources for the non-free sfx and music
+Source1: http://abuse.zoy.org/raw-attachment/wiki/download/%{name}-0.8.tar.gz
+Source2: %{name}.png
+Source3: %{name}.desktop
+# Fix NULL pointer deref at startup
+Patch0: 0001-Fix-NULL-pointer-deref-when-built-with-gcc-O1-or-O2.patch
+BuildRequires: SDL2-devel SDL2_mixer-devel alsa-lib-devel libGLU-devel
+BuildRequires: cmake desktop-file-utils ImageMagick
Requires: hicolor-icon-theme
-# abuse 0.8 comes with the data bundled
-Obsoletes: fRaBs < 2.11-7
-Provides: fRaBs = 2.11-7
%description
-This is the SDL version of Abuse, the classic Crack-Dot-Com game. It can run in
-a window or fullscreen and it has stereo sound with sound panning.
+This is the SDL version of Abuse, the classic Crack-Dot-Com game. It can run
+in a window or fullscreen and it has stereo sound with sound panning.
%prep
-%setup -q
+%autosetup -p1 -n %{name}-%{commit} -a 1
+mv abuse-0.8/data/sfx abuse-0.8/data/music data
+sed -i 's/@VERSION@/%{version}/' doc/abuse*.6.in
%build
-%configure --with-assetdir=%{_datadir}/%{name}
+mkdir build
+pushd build
+# BUILD_SHARED_LIBS:BOOL=OFF -> make builtin helper libs static
+%cmake -DBUILD_SHARED_LIBS:BOOL=OFF ..
make %{?_smp_mflags}
+popd
%install
+pushd build
%make_install INSTALL="install -p"
+popd
+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps
convert -background transparent -resize 256x256 -extent 256x256-28+0 \
- %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+ %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
-
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
+install -p -m 0644 doc/abuse.6.in $RPM_BUILD_ROOT%{_mandir}/man6/abuse.6
+install -p -m 0644 doc/abuse-tool.6.in $RPM_BUILD_ROOT%{_mandir}/man6/abuse-tool.6
%files
-%doc AUTHORS COPYING* NEWS README
+%doc AUTHORS COPYING* NEWS README.md
%{_bindir}/%{name}*
-%{_datadir}/%{name}
+%{_datadir}/games/%{name}
%{_mandir}/man6/%{name}*.6*
%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%changelog
+* Mon Feb 26 2018 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.9-1
+- Rebase to now github upstream, which calls itself version 0.9
+- 0.9 uses SDL2 instead of SDL-1.2
+- Fix abuse crashing at startup, making it playable again (rf#4276)
+- Modernize spec file a bit
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 4d520dc..9a937a6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
ec678b8dc8d00e0382d8c805c6438489 abuse-0.8.tar.gz
+bbc431f386783b10fa39f2518f75970d abuse-3c674b1.tar.gz
6 years, 2 months
[dfhack/f27] Update to 0.44.05-r2.
by Ben Rosser
Summary of changes:
c5cccc3... Update to 0.44.05-r2. (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[dfhack] Update to 0.44.05-r2.
by Ben Rosser
commit c5cccc3c517c34b7286ed4dbac7d2da4982012b9
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Feb 26 11:37:40 2018 -0500
Update to 0.44.05-r2.
.gitignore | 5 +++++
dfhack.spec | 13 ++++++++-----
git-describe.h | 8 ++++----
sources | 8 ++++----
4 files changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bba1d9b..69f2716 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,11 @@
+*.rpm
/dfhack-0.44.05-r1.tar.gz
/dfhack-clsocket-0f0ad78.tar.gz
/dfhack-df-structures-40da723.tar.gz
/dfhack-isoworld-3ff3f05.tar.gz
/dfhack-scripts-8d079a5.tar.gz
/dfhack-stonesense-455b51a.tar.gz
+/dfhack-0.44.05-r2.tar.gz
+/dfhack-df-structures-2794f8a.tar.gz
+/dfhack-scripts-9d8f209.tar.gz
+/dfhack-stonesense-031bf4c.tar.gz
diff --git a/dfhack.spec b/dfhack.spec
index bc5a6f1..5e52d14 100644
--- a/dfhack.spec
+++ b/dfhack.spec
@@ -8,13 +8,13 @@
# dfhack submodule: depends/clsocket
%global commit10 0f0ad78c4fd429caacd0694b5c868dbeacea16b6
# dfhack submodule: library/xml
-%global commit11 40da7231a0114fe3420d475961b08826f64fbf79
+%global commit11 2794f8a6d7405d4858bac486a0bb17b94740c142
# dfhack submodule: plugins/isoworld
%global commit12 3ff3f05da53077dd9e67c1eef672427a2bfd95ea
# dfhack submodule: plugins/stonesense
-%global commit13 455b51aab7a93095a775285782635cfc17ac651a
+%global commit13 031bf4caafec321dd315202a83539d052ed49d84
# dfhack submodule: scripts
-%global commit14 8d079a59122d9ba72ce9c0f7687402a343d09bc7
+%global commit14 9d8f2096fc4c247299cbc94c6a8d756f31690a4b
# End autogenerated commit lines.
@@ -27,7 +27,7 @@
# dfhack version string.
%global dfversion 0.44.05
-%global hackrelease r1
+%global hackrelease r2
# Define dfhack build architecture.
%global dfhack_arch 32
@@ -37,7 +37,7 @@
Name: dfhack
Version: %{dfversion}
-Release: 2.%{hackrelease}%{?dist}
+Release: 3.%{hackrelease}%{?dist}
Summary: Memory hacking library for Dwarf Fortress and a set of tools that use it
# It'd be nice if we could unbundle some of these things, but I suspect it won't happen.
@@ -321,6 +321,9 @@ rm -f docs/build.sh
%license LICENSE.rst
%changelog
+* Mon Feb 26 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.05-3.r2
+- Update to latest upstream release for 0.44.05.
+
* Wed Feb 21 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.05-2.r1
- Added missing provides for dfhack-static to dfhack-devel.
diff --git a/git-describe.h b/git-describe.h
index de4b0fb..b7f9c26 100644
--- a/git-describe.h
+++ b/git-describe.h
@@ -1,5 +1,5 @@
-#define DFHACK_GIT_DESCRIPTION "0.44.05-r1-0-gc92227f0"
-#define DFHACK_GIT_COMMIT "c92227f007114148f0b48059908b86645a6c36d7"
-#define DFHACK_GIT_XML_EXPECTED_COMMIT "40da7231a0114fe3420d475961b08826f64fbf79"
-#define DFHACK_GIT_XML_COMMIT "40da7231a0114fe3420d475961b08826f64fbf79"
+#define DFHACK_GIT_DESCRIPTION "0.44.05-r2-0-g0e7ab278"
+#define DFHACK_GIT_COMMIT "0e7ab27850821993ebc317bed9dc0135f030a3e5"
+#define DFHACK_GIT_XML_EXPECTED_COMMIT "2794f8a6d7405d4858bac486a0bb17b94740c142"
+#define DFHACK_GIT_XML_COMMIT "2794f8a6d7405d4858bac486a0bb17b94740c142"
#define DFHACK_GIT_XML_MATCH
diff --git a/sources b/sources
index 2905517..0c65101 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-a5caf80229e67fb88096975e8a858a0e dfhack-0.44.05-r1.tar.gz
+28d215fc6ff45db4e87bee26e33fb39f dfhack-df-structures-2794f8a.tar.gz
+517725c664bb1ca0c4e314ac27667d15 dfhack-scripts-9d8f209.tar.gz
+16c76bbc022f2e674c655a715900a56c dfhack-stonesense-031bf4c.tar.gz
b16252960c7de5dfa6a580cbd6a32dbd dfhack-clsocket-0f0ad78.tar.gz
-cb37d829a73fbdbe6656dfdef8814b1f dfhack-df-structures-40da723.tar.gz
5c5a2bd6b863de63d7d1dcb4cf3c1176 dfhack-isoworld-3ff3f05.tar.gz
-cc008e1113678d1893ec3df441e6b199 dfhack-scripts-8d079a5.tar.gz
-aa48d3b86648b7d024bec20b8ec1f1a6 dfhack-stonesense-455b51a.tar.gz
+88d8925b5e701654284b77c91c561679 dfhack-0.44.05-r2.tar.gz
6 years, 2 months
[vdr-markad] Use compat-ffmpeg28 for F28
by Leigh Scott
commit 063bf807ad133e70d66ca033fcced57405ed0db7
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 26 13:35:12 2018 +0000
Use compat-ffmpeg28 for F28
vdr-markad.spec | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 1f2bc41..e72465b 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -2,9 +2,15 @@
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global gitdate 20170313
+%if 0%{?fedora} > 27
+%bcond_without compat_ffmpeg
+%else
+%bcond_with compat_ffmpeg
+%endif
+
Name: vdr-markad
Version: 0.1.4
-Release: 15.%{gitdate}git%{shortcommit0}%{?dist}
+Release: 16.%{gitdate}git%{shortcommit0}%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
# how to get the tarball
@@ -15,7 +21,11 @@ Source0: http://projects.vdr-developer.org/git/vdr-plugin-markad.git/snap
Source1: %{name}.conf
BuildRequires: vdr-devel >= 1.7.30
+%if %{with compat_ffmpeg}
+BuildRequires: compat-ffmpeg28-devel
+%else
BuildRequires: ffmpeg-devel
+%endif
Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
%description
@@ -24,11 +34,17 @@ VDR-Plugin: markad - %{summary}
%prep
%setup -qn vdr-plugin-markad-%{commit0}
+%if ! %{with compat_ffmpeg}
# ffmpeg3 patch
# replaced function avcodec_alloc_frame(); by av_frame_alloc();
sed -i -e 's|avcodec_alloc_frame()|av_frame_alloc()|g' command/decoder.cpp
+%endif
+
%build
+%if %{with compat_ffmpeg}
+export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
+%endif
make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} \
LIBDIR=. VDRDIR=%{_libdir}/vdr VDRINCDIR=%{_includedir} \
LOCALEDIR=./locale all
@@ -72,6 +88,9 @@ fi
%{vdr_vardir}/markad/
%changelog
+* Mon Feb 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.1.4-16.20170313gitea2e182
+- Use compat-ffmpeg28 for F28
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.1.4-15.20170313gitea2e182
- Rebuilt for ffmpeg-3.5 git
6 years, 2 months
[vdr-softhddevice-openglosd] Use compat-ffmpeg28 for F28
by Leigh Scott
commit 49cf5681e73834e2e56ff0fb8eadd2bc6804611b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 26 13:30:19 2018 +0000
Use compat-ffmpeg28 for F28
vdr-softhddevice-openglosd.spec | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/vdr-softhddevice-openglosd.spec b/vdr-softhddevice-openglosd.spec
index 6783a6a..c149d12 100644
--- a/vdr-softhddevice-openglosd.spec
+++ b/vdr-softhddevice-openglosd.spec
@@ -3,9 +3,15 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gitdate 20160717
+%if 0%{?fedora} > 27
+%bcond_without compat_ffmpeg
+%else
+%bcond_with compat_ffmpeg
+%endif
+
Name: vdr-softhddevice-openglosd
Version: 0.6.1
-Release: 14.%{gitdate}git%{shortcommit}%{?dist}
+Release: 15.%{gitdate}git%{shortcommit}%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
@@ -25,7 +31,11 @@ BuildRequires: gettext
BuildRequires: libva-devel
BuildRequires: libvdpau-devel
BuildRequires: alsa-lib-devel
+%if %{with compat_ffmpeg}
+BuildRequires: compat-ffmpeg28-devel
+%else
BuildRequires: ffmpeg-devel
+%endif
BuildRequires: freeglut-devel
BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
@@ -64,7 +74,9 @@ OSD output was added. That works only with VDPAU output on NVidia cards.
%setup -qn softhddevice-openglosd-%{commit}
%patch0 -p1
%patch1 -p0
+%if ! %{with compat_ffmpeg}
%patch2 -p1
+%endif
# remove .git files and Gentoo files
rm -f .indent.pro .gitignore .gitattributes
@@ -78,6 +90,9 @@ done
mv README.txt README
%build
+%if %{with compat_ffmpeg}
+export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
+%endif
make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags}
%install
@@ -93,6 +108,9 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Mon Feb 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6.1-15.20160717git569fde5
+- Use compat-ffmpeg28 for F28
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6.1-14.20160717git569fde5
- Rebuilt for ffmpeg-3.5 git
6 years, 2 months
[vdr-softhddevice-openglosd] Revert "Rebuilt for ffmpeg-3.5 git"
by Leigh Scott
commit 3890bca1a8655d60f8dc09dde3a73e58a0df5537
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 26 13:27:30 2018 +0000
Revert "Rebuilt for ffmpeg-3.5 git"
This reverts commit f624b4fe21e063adac67bda797a8042640d62797.
vdr-softhddevice-openglosd.spec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/vdr-softhddevice-openglosd.spec b/vdr-softhddevice-openglosd.spec
index 3a5807f..6783a6a 100644
--- a/vdr-softhddevice-openglosd.spec
+++ b/vdr-softhddevice-openglosd.spec
@@ -25,7 +25,7 @@ BuildRequires: gettext
BuildRequires: libva-devel
BuildRequires: libvdpau-devel
BuildRequires: alsa-lib-devel
-BuildRequires: ffmpeg-devel < 3.4.1
+BuildRequires: ffmpeg-devel
BuildRequires: freeglut-devel
BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
@@ -95,8 +95,6 @@ install -Dpm 644 %{SOURCE1} \
%changelog
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6.1-14.20160717git569fde5
- Rebuilt for ffmpeg-3.5 git
-- Added BR ffmpeg-devel < 3.4.1, VDPAU has been removed with ffmpeg 3.4.1 and therefore
- vdr-softhddevice will not longer working.
* Mon Jan 15 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.1-13.20160717git569fde5
- Rebuilt for VA-API 1.0.0
6 years, 2 months
[vdr-softhddevice] Use compat-ffmpeg28 for F28
by Leigh Scott
commit ac98d0e9fbecf1e4fe77365684c3f8f95ecac668
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 26 13:17:00 2018 +0000
Use compat-ffmpeg28 for F28
vdr-softhddevice.spec | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec
index 0a20f37..db59e89 100644
--- a/vdr-softhddevice.spec
+++ b/vdr-softhddevice.spec
@@ -2,9 +2,15 @@
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global gitdate 20151103
+%if 0%{?fedora} > 27
+%bcond_without compat_ffmpeg
+%else
+%bcond_with compat_ffmpeg
+%endif
+
Name: vdr-softhddevice
Version: 0.6.1
-Release: 13.%{gitdate}git%{shortcommit0}%{?dist}
+Release: 14.%{gitdate}git%{shortcommit0}%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
@@ -24,7 +30,11 @@ BuildRequires: gettext
BuildRequires: libva-devel
BuildRequires: libvdpau-devel
BuildRequires: alsa-lib-devel
+%if %{with compat_ffmpeg}
+BuildRequires: compat-ffmpeg28-devel
+%else
BuildRequires: ffmpeg-devel
+%endif
BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
BuildRequires: xcb-util-wm-devel
@@ -57,7 +67,9 @@ A software and GPU emulated HD output device plugin for VDR.
%setup -qn vdr-plugin-softhddevice-%{commit0}
%patch0 -p1
%patch1 -p0
+%if ! %{with compat_ffmpeg}
%patch2 -p1
+%endif
# remove .git files and Gentoo files
rm -f .indent.pro .gitignore .gitattributes
@@ -70,6 +82,9 @@ for f in ChangeLog README.txt; do
done
%build
+%if %{with compat_ffmpeg}
+export PKG_CONFIG_PATH=%{_libdir}/compat-ffmpeg28/pkgconfig
+%endif
make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags}
%install
@@ -85,6 +100,9 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Mon Feb 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6.1-14.20151103git6dfa88a
+- Use compat-ffmpeg28 for F28
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6.1-13.20151103git6dfa88a
- Rebuilt for ffmpeg-3.5 git
6 years, 2 months
[vdr-softhddevice] Revert "Rebuilt for ffmpeg-3.5 git"
by Leigh Scott
commit 512cdc597e1218d2dff975f20cb67da71d1084df
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Feb 26 13:10:57 2018 +0000
Revert "Rebuilt for ffmpeg-3.5 git"
This reverts commit 000f24ad5b5af2fc72b04b3282b372dbc27304b1.
vdr-softhddevice.spec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec
index 6e50997..0a20f37 100644
--- a/vdr-softhddevice.spec
+++ b/vdr-softhddevice.spec
@@ -24,7 +24,7 @@ BuildRequires: gettext
BuildRequires: libva-devel
BuildRequires: libvdpau-devel
BuildRequires: alsa-lib-devel
-BuildRequires: ffmpeg-devel < 3.4.1
+BuildRequires: ffmpeg-devel
BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
BuildRequires: xcb-util-wm-devel
@@ -87,8 +87,6 @@ install -Dpm 644 %{SOURCE1} \
%changelog
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.6.1-13.20151103git6dfa88a
- Rebuilt for ffmpeg-3.5 git
-- Added BR ffmpeg-devel < 3.4.1, VDPAU has been removed with ffmpeg 3.4.1 and therefore
- vdr-softhddevice will not longer working.
* Mon Jan 15 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.1-12.20151103git6dfa88a
- Rebuilt for VA-API 1.0.0
6 years, 2 months