[audacious-plugins-freeworld/f29] (5 commits) ...Update to 3.10 as in Fedora proper
by Leigh Scott
Summary of changes:
4940300... Remove Group tag (*)
88d9646... Use make macros and update buildroot macro (*)
193f518... Add versioned audacious* BuildRequires and Requires (*)
bd3f1cf... Drop obsolete Obsoletes (*)
f73a411... Update to 3.10 as in Fedora proper (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[audacious-plugins-freeworld] Update to 3.10 as in Fedora proper
by Leigh Scott
commit f73a411e387b75190adcbb71f49cc8aef69594df
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Oct 14 14:02:09 2018 +0100
Update to 3.10 as in Fedora proper
.gitignore | 1 +
audacious-plugins-freeworld.spec | 21 ++++++++++++++-------
sources | 2 +-
3 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aaac998..00a49d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ audacious-plugins-3.6.2.tar.bz2
audacious-plugins-3.7.2.tar.bz2
/audacious-plugins-3.8.tar.bz2
/audacious-plugins-3.9.tar.bz2
+/audacious-plugins-3.10.tar.bz2
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index 4413068..4a4ecea 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -4,8 +4,8 @@
%endif
Name: audacious-plugins-freeworld
-Version: 3.9
-Release: 6%{?dist}
+Version: 3.10
+Release: 1%{?dist}
Summary: Additional plugins for the Audacious media player
License: GPLv3
URL: http://audacious-media-player.org/
@@ -82,11 +82,11 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
%build
%configure \
--disable-rpath \
- --disable-vorbis \
- --disable-neon \
- --disable-flac \
- --disable-wavpack \
- --disable-mpg123
+ --disable-vorbis \
+ --disable-neon \
+ --disable-flac \
+ --disable-wavpack \
+ --disable-mpg123
%make_build -C src/aac
%make_build -C src/ffaudio
%make_build -C src/mms
@@ -115,6 +115,13 @@ find %buildroot -type f -name "*.la" -exec rm -f {} ';'
%changelog
+* Sun Oct 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.10-1
+- Update to 3.10 as in Fedora proper
+- Remove Group tag
+- Use make macros and update buildroot macro
+- Add versioned audacious* BuildRequires and Requires
+- Drop obsolete Obsoletes
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index e091218..4ffb67f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe467c4dcee8abbf571e69ed980a56b6 audacious-plugins-3.9.tar.bz2
+26268359f4f21171de35cc10d0545733 audacious-plugins-3.10.tar.bz2
6 years, 1 month
[audacious-plugins-freeworld] Drop obsolete Obsoletes
by Leigh Scott
commit bd3f1cf8254b0e1def71822fca461020e3d6f7d0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Oct 14 13:56:19 2018 +0100
Drop obsolete Obsoletes
audacious-plugins-freeworld.spec | 5 -----
1 file changed, 5 deletions(-)
---
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index c4c2724..4413068 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -57,11 +57,6 @@ Summary: FFMpeg/FAAD2 based input plugin for Audacious
%{?aud_plugin_dep}
Requires: audacious-plugins%{?_isa} >= %{version}
-# obsolete discontinued plugins
-Obsoletes: audacious-plugins-freeworld-alac <= 2.1
-Obsoletes: audacious-plugins-freeworld-tta <= 2.1
-Obsoletes: audacious-plugins-freeworld-wma <= 2.1
-
%description ffaudio
FFMpeg/FAAD2 based input plugin for Audacious.
6 years, 1 month
[audacious-plugins-freeworld] Add versioned audacious* BuildRequires and Requires
by Leigh Scott
commit 193f5186f36dd256c5cf174b976e928c14dc1411
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Oct 14 13:53:31 2018 +0100
Add versioned audacious* BuildRequires and Requires
audacious-plugins-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index b272365..c4c2724 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -11,7 +11,7 @@ License: GPLv3
URL: http://audacious-media-player.org/
Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{version}....
-BuildRequires: audacious-devel >= 3.9
+BuildRequires: audacious-devel >= %{version}
BuildRequires: zlib-devel
BuildRequires: libxml2-devel
BuildRequires: taglib-devel >= 1.4
@@ -42,6 +42,7 @@ This package contains additional plugins for the Audacious media player.
%package aac
Summary: AAC playback plugin for Audacious
%{?aud_plugin_dep}
+Requires: audacious-plugins%{?_isa} >= %{version}
%description aac
Audacious is a media player that currently uses a skinned
@@ -54,6 +55,7 @@ This is the plugin needed to play AAC audio files.
%package ffaudio
Summary: FFMpeg/FAAD2 based input plugin for Audacious
%{?aud_plugin_dep}
+Requires: audacious-plugins%{?_isa} >= %{version}
# obsolete discontinued plugins
Obsoletes: audacious-plugins-freeworld-alac <= 2.1
@@ -67,6 +69,7 @@ FFMpeg/FAAD2 based input plugin for Audacious.
%package mms
Summary: MMS stream plugin for Audacious
%{?aud_plugin_dep}
+Requires: audacious-plugins%{?_isa} >= %{version}
%description mms
Audacious is a media player that currently uses a skinned
6 years, 1 month
[zsnes] Added a patch to fix freeze on exit (#5036) Added gcc dependency Removed Group tag Removed desktop s
by Andrea Musuruane
commit b1ee9502a030b57fdcc0a2d901188220ccfd8d2f
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sun Oct 14 15:02:10 2018 +0200
Added a patch to fix freeze on exit (#5036)
Added gcc dependency
Removed Group tag
Removed desktop scriptlets
Added license tag
Minor improvements
zsnes-1.51-freeze_on_exit.patch | 38 ++++++++++++++++++++++++++++++
zsnes.spec | 52 ++++++++++++++++++++---------------------
2 files changed, 63 insertions(+), 27 deletions(-)
---
diff --git a/zsnes-1.51-freeze_on_exit.patch b/zsnes-1.51-freeze_on_exit.patch
new file mode 100644
index 0000000..83584dd
--- /dev/null
+++ b/zsnes-1.51-freeze_on_exit.patch
@@ -0,0 +1,38 @@
+--- linux/audio.c.debug 2018-09-28 23:10:39.850825458 +0900
++++ linux/audio.c 2018-09-29 00:33:07.020293976 +0900
+@@ -37,6 +37,7 @@ static pthread_mutex_t audio_mutex = PTH
+ static pthread_cond_t audio_wait = PTHREAD_COND_INITIALIZER;
+ static ao_device *audio_device = 0;
+ static volatile unsigned int samples_waiting = 0;
++static volatile unsigned int samples_terminating = 0;
+ #endif
+
+ unsigned char *sdl_audio_buffer = 0;
+@@ -146,7 +147,7 @@ static void *SoundThread_ao(void *useles
+ pthread_mutex_lock(&audio_mutex);
+
+ //The while() is there to prevent error codes from breaking havoc
+- while (!samples_waiting)
++ while (!samples_waiting && !samples_terminating)
+ {
+ pthread_cond_wait(&audio_wait, &audio_mutex); //Wait for signal
+ }
+@@ -155,6 +156,7 @@ static void *SoundThread_ao(void *useles
+ samples_waiting = 0;
+ pthread_mutex_unlock(&audio_mutex);
+
++ if (samples_terminating) break;
+ SoundWriteSamples_ao(samples);
+ }
+ return(0);
+@@ -338,8 +340,10 @@ void DeinitSound()
+ #ifdef __LIBAO__
+ if (audio_device)
+ {
++ samples_terminating = 1;
+ pthread_kill(audio_thread, SIGTERM);
+ pthread_mutex_destroy(&audio_mutex);
++ pthread_cond_broadcast(&audio_wait);
+ pthread_cond_destroy(&audio_wait);
+ ao_close(audio_device);
+ }
diff --git a/zsnes.spec b/zsnes.spec
index 54bf46e..4c6b170 100644
--- a/zsnes.spec
+++ b/zsnes.spec
@@ -4,9 +4,8 @@
Summary: A Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 21%{?dist}
+Release: 22%{?dist}
License: GPLv2
-Group: Applications/Emulators
URL: http://www.zsnes.com/
Source: http://dl.sf.net/%{name}/%{name}%{pkgversion}src.tar.bz2
# Source Mage
@@ -30,10 +29,14 @@ Patch7: zsnes-1.51-libpng15.patch
Patch8: zsnes-1.51-gcc47.patch
# Fix crash due to passing a non initialized ao_sample_format struct to libao
Patch9: zsnes-1.51-libao-crash.patch
+# Fix freeze on exit
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=5036
+Patch10: zsnes-1.51-freeze_on_exit.patch
# This is to build only for ix86 on plague
#ExclusiveArch: %{ix86}
ExclusiveArch: i686
+BuildRequires: gcc
BuildRequires: automake
BuildRequires: nasm
BuildRequires: SDL-devel >= 1.2.0
@@ -66,6 +69,7 @@ and to save the game state, even network play is possible.
%patch7 -p2
%patch8 -p2
%patch9 -p2
+%patch10 -p0
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -95,41 +99,26 @@ autoconf
--enable-libao \
--enable-release \
--disable-cpucheck force_arch=i686
-make %{?_smp_mflags}
+%make_build
%install
-make install DESTDIR=%{buildroot}
+%make_install
# install desktop file
-mkdir -p %{buildroot}%{_datadir}/applications
+install -d -m 755 %{buildroot}%{_datadir}/applications
desktop-file-install \
-%if 0%{?fedora} && 0%{?fedora} < 19
- --vendor dribble \
-%endif
+ --remove-key Path \
--remove-category Application \
--dir %{buildroot}%{_datadir}/applications \
linux/%{name}.desktop
# install icons
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
-install -m 644 icons/16x16x32.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/zsnes.png
-install -m 644 icons/32x32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/zsnes.png
-install -m 644 icons/48x48x32.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/zsnes.png
-install -m 644 icons/64x64x32.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/zsnes.png
-
-
-%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 || :
+for i in 16 32 48 64; do
+ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -m 644 icons/${i}x${i}x32.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+done
%files
@@ -140,12 +129,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%doc ../docs/authors.txt ../docs/license.txt ../docs/README.LINUX
+%doc ../docs/authors.txt ../docs/README.LINUX
%doc ../docs/support.txt ../docs/thanks.txt ../docs/todo.txt
%doc ../docs/readme.htm/ ../docs/readme.txt/
+%license ../docs/license.txt
%changelog
+* Sun Oct 14 2018 Andrea Musuruane <musuruan(a)gmail.com> - 1.51-22
+- Added a patch to fix freeze on exit (#5036)
+- Added gcc dependency
+- Removed Group tag
+- Removed desktop scriptlets
+- Added license tag
+- Minor improvements
+
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.51-21
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
6 years, 1 month
[audacious-plugins-freeworld] Use make macros and update buildroot macro
by Leigh Scott
commit 88d9646b5a1d61aa592a5dd0b9a2975c54e1d507
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Oct 14 13:41:41 2018 +0100
Use make macros and update buildroot macro
audacious-plugins-freeworld.spec | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index 4040489..b272365 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -89,16 +89,16 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
--disable-flac \
--disable-wavpack \
--disable-mpg123
-make V=1 %{?_smp_mflags} -C src/aac
-make V=1 %{?_smp_mflags} -C src/ffaudio
-make V=1 %{?_smp_mflags} -C src/mms
+%make_build -C src/aac
+%make_build -C src/ffaudio
+%make_build -C src/mms
%install
-make -C src/aac install DESTDIR=$RPM_BUILD_ROOT
-make -C src/ffaudio install DESTDIR=$RPM_BUILD_ROOT
-make -C src/mms install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%make_install -C src/aac
+%make_install -C src/ffaudio
+%make_install -C src/mms
+find %buildroot -type f -name "*.la" -exec rm -f {} ';'
%files
6 years, 1 month
[audacious-plugins-freeworld] Remove Group tag
by Leigh Scott
commit 4940300152de5af21f9c1d38f2faff33cb29a10f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Oct 14 13:37:51 2018 +0100
Remove Group tag
audacious-plugins-freeworld.spec | 5 -----
1 file changed, 5 deletions(-)
---
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index 43cfbc5..4040489 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -7,8 +7,6 @@ Name: audacious-plugins-freeworld
Version: 3.9
Release: 6%{?dist}
Summary: Additional plugins for the Audacious media player
-
-Group: Applications/Multimedia
License: GPLv3
URL: http://audacious-media-player.org/
Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{version}....
@@ -43,7 +41,6 @@ This package contains additional plugins for the Audacious media player.
%package aac
Summary: AAC playback plugin for Audacious
-Group: Applications/Multimedia
%{?aud_plugin_dep}
%description aac
@@ -56,7 +53,6 @@ This is the plugin needed to play AAC audio files.
%package ffaudio
Summary: FFMpeg/FAAD2 based input plugin for Audacious
-Group: Applications/Multimedia
%{?aud_plugin_dep}
# obsolete discontinued plugins
@@ -70,7 +66,6 @@ FFMpeg/FAAD2 based input plugin for Audacious.
%package mms
Summary: MMS stream plugin for Audacious
-Group: Applications/Multimedia
%{?aud_plugin_dep}
%description mms
6 years, 1 month
[kodi/f29] (8 commits) ...Add sources
by Nicolas Chauvet
Summary of changes:
29c8f36... ExcludeArch power64 ppc64le (*)
fa52240... Drop arch conditionals on vaapi/vdpau (*)
09bfff7... Allow to build EGL/GLES everywhere (*)
315b69f... Add firewalld sub-package when relevant (*)
b7d1ffc... Update tarball (*)
3148cb3... Add changelog (*)
237ff10... Add missing macros for firewalld post (*)
830026b... Add sources (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[zoneminder/el7: 3/3] Merge branch 'master' into el7
by Andrew Bauer
commit 21980c0339b3e42ae4183ccd919d7158dc780f96
Merge: e29b84d 5d0dceb
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sat Oct 13 14:15:12 2018 -0500
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 9 ++++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
---
6 years, 1 month
