[dwarffortress] Updated to latest upstream release, 0.44.02.
by Ben Rosser
commit 217b4e18e0c9a95bf8da3bdc492ead023e03a53e
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Wed Nov 29 19:13:29 2017 -0500
Updated to latest upstream release, 0.44.02.
.gitignore | 3 +++
dwarffortress.spec | 14 +++++++++-----
sources | 6 +++---
3 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fbdd532..fa70018 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
/df_43_05_linux.tar.bz2
/df_43_05_linux32.tar.bz2
/dwarffortress-launcher.tar.xz
+/0.44.02.zip
+/df_44_02_linux.tar.bz2
+/df_44_02_linux32.tar.bz2
diff --git a/dwarffortress.spec b/dwarffortress.spec
index a8516fb..a960479 100644
--- a/dwarffortress.spec
+++ b/dwarffortress.spec
@@ -4,17 +4,17 @@
%global __strip /bin/true
Name: dwarffortress
-Version: 0.43.05
-Release: 6%{?dist}
+Version: 0.44.02
+Release: 1%{?dist}
Summary: A single-player procedurally generated fantasy game
License: Dwarf Fortress
URL: http://www.bay12games.com/dwarves/
-Source0: http://www.bay12games.com/dwarves/df_43_05_linux.tar.bz2
-Source1: http://www.bay12games.com/dwarves/df_43_05_linux32.tar.bz2
+Source0: http://www.bay12games.com/dwarves/df_44_02_linux.tar.bz2
+Source1: http://www.bay12games.com/dwarves/df_44_02_linux32.tar.bz2
Source2: https://github.com/svenstaro/dwarf_fortress_unfuck/archive/%{version}.zip
-Source3: https://www.acm.jhu.edu/~bjr/fedora/dwarffortress/rpmfusion/dwarffortress...
+Source3: https://mars.arosser.com/fedora/dwarffortress/rpmfusion/dwarffortress-lau...
# Appstream file.
Source4: https://www.acm.jhu.edu/~bjr/fedora/dwarffortress/rpmfusion/dwarffortress...
@@ -129,6 +129,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/appdata/dwarffortress.appdata.xml
%changelog
+* Wed Nov 29 2017 Ben Rosser <rosser.bjr(a)gmail.com> 0.44.02-1
+- Updated to latest upstream release.
+- Update URL for dwarffortress launcher.
+
* Mon Aug 07 2017 Ben Rosser <rosser.bjr(a)gmail.com> 0.43.05-6
- Write and include AppData metadata file for Dwarf Fortress.
- Use macros for cmake and make when compiling.
diff --git a/sources b/sources
index 8d20c63..6f105c7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-73025c58c3e3f5ef2b6f8aa4db495c6f 0.43.05.zip
-5b8ee45e906d021c053f816e443c2983 df_43_05_linux.tar.bz2
-1c02f4cd887f4d8ad33f9642b70a5285 df_43_05_linux32.tar.bz2
df7f7f5f00c918504c3fa2147566154f dwarffortress-launcher.tar.xz
+8b84bc3dc0060f461308af5d8a6c955b 0.44.02.zip
+56501ed956a0802d9cc219a66bffa8f8 df_44_02_linux.tar.bz2
+39f1a8aa32c3afa8a73d3513439f286c df_44_02_linux32.tar.bz2
7 years
[wl-kmod] Add patch for kernel >= 4.14 from Olaf Hering - thanks to Tim Thomas
by Nicolas Viéville
commit c1d4c41b00265de206574dc5ee07424cf5eb94bc
Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr>
Date: Wed Nov 29 21:15:23 2017 +0100
Add patch for kernel >= 4.14 from Olaf Hering - thanks to Tim Thomas
...1_kernel_4.14_new_kernel_read_function_prototype.patch | 15 +++++++++++++++
wl-kmod.spec | 7 ++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch b/wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch
new file mode 100644
index 0000000..9de5f53
--- /dev/null
+++ b/wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch
@@ -0,0 +1,15 @@
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/shared/linux_osl.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/shared/linux_osl.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/shared/linux_osl.c 2017-06-03 15:26:57.092475595 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/shared/linux_osl.c 2017-11-24 10:45:55.764626061 +0100
+@@ -1080,7 +1080,11 @@
+ if (!image)
+ return 0;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ rdlen = kernel_read(fp, buf, len, &fp->f_pos);
++#else
+ rdlen = kernel_read(fp, fp->f_pos, buf, len);
++#endif
+ if (rdlen > 0)
+ fp->f_pos += rdlen;
+
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 34fc233..0fc636a 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -8,7 +8,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -26,6 +26,7 @@ Patch6: wl-kmod-007_kernel_4.8_add_cfg80211_scan_info_struct.patch
Patch7: wl-kmod-008_fix_kernel_warnings.patch
Patch8: wl-kmod-009_kernel_4.11_remove_last_rx_in_net_device_struct.patch
Patch9: wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch
+Patch10: wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -76,6 +77,7 @@ pushd %{name}-%{version}-src
%patch7 -p1 -b .fix_kernel_warnings
%patch8 -p1 -b .kernel_4.11_remove_last_rx_in_net_device_struct
%patch9 -p1 -b .kernel_4.12_add_cfg80211_roam_info_struct
+%patch10 -p1 -b .kernel_4.14_new_kernel_read_function_prototype
popd
for kernel_version in %{?kernel_versions} ; do
@@ -105,6 +107,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 29 2017 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-15
+- Add patch for kernel >= 4.14 from Olaf Hering - thanks to Tim Thomas
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 6.30.223.271-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
7 years
[ffmpeg] rebuild against new libmfx (rhbz#1471768)
by Dominik Mierzejewski
commit bc2235ba5056537d49ca5c5ac48891485a83d0c7
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Wed Nov 29 12:58:33 2017 +0100
rebuild against new libmfx (rhbz#1471768)
ffmpeg.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 3739ccc..e91d7b7 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -124,7 +124,7 @@ BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
%{?!_without_vpx:BuildRequires: libvpx-devel >= 0.9.1}
%ifarch %{ix86} x86_64
-%{!?_without_mfx:BuildRequires: libmfx-devel}
+%{!?_without_mfx:BuildRequires: libmfx-devel >= 1.23-1}
BuildRequires: libXvMC-devel
BuildRequires: nasm
%endif
@@ -406,6 +406,7 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
* Tue Nov 28 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.4-6
- enable support for vid.stab (rfbz#4713)
+- rebuild against new libmfx (rhbz#1471768)
* Wed Oct 25 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.4-5
- drop support for building on ppc (32bit)
7 years
[ffmpeg] enable support for vid.stab (rfbz#4713)
by Dominik Mierzejewski
commit e3947f1b8e5bf37314d0448661d139fd854b6548
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Wed Nov 29 11:55:21 2017 +0100
enable support for vid.stab (rfbz#4713)
ffmpeg.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 9ef537a..3739ccc 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -71,7 +71,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 3.4
-Release: 5%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 6%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -153,6 +153,7 @@ BuildRequires: subversion
BuildRequires: texinfo
%{?_with_twolame:BuildRequires: twolame-devel}
%{?_with_wavpack:BuildRequires: wavpack-devel}
+%{!?_without_vidstab:BuildRequires: vid.stab-devel}
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
%{!?_without_x265:BuildRequires: x265-devel}
%{!?_without_xvid:BuildRequires: xvidcore-devel}
@@ -266,6 +267,7 @@ This package contains development files for %{name}
%{?_with_twolame:--enable-libtwolame} \\\
--enable-libvorbis \\\
--enable-libv4l2 \\\
+ %{!?_without_vidstab:--enable-libvidstab} \\\
%{!?_without_vpx:--enable-libvpx} \\\
%{?_with_webp:--enable-libwebp} \\\
%{!?_without_x264:--enable-libx264} \\\
@@ -402,6 +404,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Nov 28 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.4-6
+- enable support for vid.stab (rfbz#4713)
+
* Wed Oct 25 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.4-5
- drop support for building on ppc (32bit)
- explicitly support ppc64p7 and ppc64le
7 years
[lpf-flash-plugin] Fixup rpm setup macro that was using -b Download just one source, instead download sources for all a
by Sérgio M. Basto
commit 33f4bc6ff3794e4fd0d5e08a5a3ab44aa414e21a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Nov 28 21:28:20 2017 +0000
Fixup rpm setup macro that was using -b
Download just one source, instead download sources for all arches
flash-plugin.spec.in | 16 +++++++++-------
lpf-flash-plugin.spec | 6 +++++-
2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/flash-plugin.spec.in b/flash-plugin.spec.in
index 2a025d9..cb2ca0c 100644
--- a/flash-plugin.spec.in
+++ b/flash-plugin.spec.in
@@ -3,15 +3,18 @@
Name: flash-plugin
Version: 27.0.0.187
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: Adobe Flash Player
License: Non-redistributable, no modification permitted
URL: http://get.adobe.com/flashplayer/
ExclusiveArch: %{ix86} x86_64
+%ifarch %{ix86}
Source0: http://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_pla...
-Source1: http://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_pla...
+%else
+Source0: http://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_pla...
+%endif
BuildRequires: desktop-file-utils
Requires: mozilla-filesystem
@@ -32,13 +35,8 @@ Requires: hicolor-icon-theme
Adobe Flash Player preferences control panel.
%prep
-%ifarch %{ix86}
%setup -q -c -n %{name}
-%endif
-%ifarch x86_64
-%setup -q -c -T -b 1 -n %{name}
-%endif
%build
# Nothing to build
@@ -77,6 +75,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/*/apps/flash-player-properties.png
%changelog
+* Tue Nov 28 2017 Sérgio Basto <sergio(a)serjux.com> - 1:27.0.0.187-2
+- Fixup rpm setup macro that was using -b
+- Download just one source, instead download sources for all arches
+
* Wed Nov 15 2017 Sérgio Basto <sergio(a)serjux.com> - 1:27.0.0.187-1
- Update to 27.0.0.187
diff --git a/lpf-flash-plugin.spec b/lpf-flash-plugin.spec
index 8209958..9e124e6 100644
--- a/lpf-flash-plugin.spec
+++ b/lpf-flash-plugin.spec
@@ -6,7 +6,7 @@
Name: lpf-flash-plugin
Version: 27.0.0.187
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: Adobe Flash Player package bootstrap
@@ -67,6 +67,10 @@ fi
%changelog
+* Tue Nov 28 2017 Sérgio Basto <sergio(a)serjux.com> - 1:27.0.0.187-2
+- Fixup rpm setup macro that was using -b
+- Download just one source, instead download sources for all arches
+
* Wed Nov 15 2017 Sérgio Basto <sergio(a)serjux.com> - 1:27.0.0.187-1
- Update to 27.0.0.187
7 years