diff --git a/.gitignore b/.gitignore index 647e200..b1ee736 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xmms2-0.7DrNo-clean.tar.bz2 /xmms2-0.8DrO_o-clean.tar.bz2 +/unreal_dm-free.music.and.free.beer.ogg diff --git a/sources b/sources index 6acf504..e2df1ea 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -010a1727b9ae4fcfa648b44a1d5e42db xmms2-0.8DrO_o-clean.tar.bz2 +SHA512 (xmms2-0.8DrO_o-clean.tar.bz2) = ab14d08baa7625e69f316e53ca9673ec8fec0a7f3cecd5656f74c317351ef033ce865acc7f3884caac22e2296bfa8f2eda866ef89a28d91ab5b4a62614879198 +SHA512 (unreal_dm-free.music.and.free.beer.ogg) = 436389158cad78a95f62a1e4de2e9add243d9fb027dec57022d9b1791ccb203539a9562bb5ffaba5918533fec79a5e2b32415eac0bc467fc8441f4906bff1225 diff --git a/xmms2-0.8DrO_o-no-mind.in.a.box.patch b/xmms2-0.8DrO_o-no-mind.in.a.box.patch new file mode 100644 index 0000000..63dd2af --- /dev/null +++ b/xmms2-0.8DrO_o-no-mind.in.a.box.patch @@ -0,0 +1,51 @@ +diff -up xmms2-0.8DrO_o/AUTHORS.nomind xmms2-0.8DrO_o/AUTHORS +--- xmms2-0.8DrO_o/AUTHORS.nomind 2017-11-20 11:59:45.363988101 -0500 ++++ xmms2-0.8DrO_o/AUTHORS 2017-11-20 11:59:58.267720781 -0500 +@@ -218,12 +218,6 @@ N: Łukasz Michalik + E: lmi@ift.uni.wroc.pl + D: Bugfixes. + +-N: Mind.In.A.Box / Stefan Poiss and Markus Hadwiger +-W: http://www.mindinabox.com/ +-D: Supplied us with a great "intro" clip. +-D: Lament for Lost Dreams clip by mind.in.a.box +-D: Copyright (c) by Stefan Poiss and Markus Hadwiger +- + N: Dave Moore + E: wrex006@gmail.com + D: missing method in C++ bindings. +diff -up xmms2-0.8DrO_o/checksums.nomind xmms2-0.8DrO_o/checksums +--- xmms2-0.8DrO_o/checksums.nomind 2017-11-20 12:01:10.770218782 -0500 ++++ xmms2-0.8DrO_o/checksums 2017-11-20 12:03:19.831545082 -0500 +@@ -63,7 +63,6 @@ + 100644 blob 1c9606c6d58527d72f4354646f9c135da24da970 doc/tutorial/vala/xmms2-client-glib.deps + 100644 blob 5beabceeda7ae335cf8633a03d0febe2f51198f0 doc/tutorial/vala/xmms2-client-glib.vapi + 100644 blob e3677f8c3b4ccbb044a3f6f4f7e4bf6c5ddf6385 doc/tutorial/vala/xmms2-client.vapi +-100644 blob 7dea2b304cdacc745218cd4187d9ab644842c798 mind.in.a.box-lament_snipplet.ogg + 100644 blob 503aea3af178fd7ba02665706151f303703c3c95 pixmaps/wscript + 100644 blob 66e6d6c205e0824d18692b40169d95a4593c9bf8 pixmaps/xmms2-128.png + 100644 blob 0e2b17d6267581a9a49d7930af3c8a4f792ec0b3 pixmaps/xmms2-16.png +diff -up xmms2-0.8DrO_o/src/xmms/medialib.c.nomind xmms2-0.8DrO_o/src/xmms/medialib.c +--- xmms2-0.8DrO_o/src/xmms/medialib.c.nomind 2017-11-20 12:02:10.520980955 -0500 ++++ xmms2-0.8DrO_o/src/xmms/medialib.c 2017-11-20 12:02:31.489546559 -0500 +@@ -367,7 +367,7 @@ xmms_medialib_init (xmms_playlist_t *pla + + xmms_medialib_entry_new (session, + "file://" SHAREDDIR +- "/mind.in.a.box-lament_snipplet.ogg", ++ "/unreal_dm-free.music.and.free.beer.ogg", + &error); + /* A default playlist containing that song has been created + * with the mlib. +diff -up xmms2-0.8DrO_o/wscript.nomind xmms2-0.8DrO_o/wscript +--- xmms2-0.8DrO_o/wscript.nomind 2017-11-20 12:02:43.392299976 -0500 ++++ xmms2-0.8DrO_o/wscript 2017-11-20 12:03:05.376844533 -0500 +@@ -131,7 +131,7 @@ def build(bld): + VERSION = bld.env.VERSION + ) + +- bld.install_files('${SHAREDDIR}', "mind.in.a.box-lament_snipplet.ogg") ++ bld.install_files('${SHAREDDIR}', "unreal_dm-free.music.and.free.beer.ogg") + + bld.add_post_fun(shutdown) + diff --git a/xmms2.spec b/xmms2.spec index b91602f..5f6fc32 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -5,14 +5,18 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 48%{?dist} +Release: 49%{?dist} License: LGPLv2+ and GPLv2+ and BSD Group: Applications/Multimedia # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. +# Also, the ogg sample included is not under a FOSS license. # http://downloads.sourceforge.net/xmms2/%{name}-%{version}%{codename}.tar.bz2 -# Cleaning it is simple, just rm -rf src/plugins/mp4 +# Cleaning it is simple, just rm -rf src/plugins/mp4 mind.in.a.box-lament_snipplet.ogg Source0: %{name}-%{version}%{codename}-clean.tar.bz2 Source1: xmms2-client-launcher.sh +# CC-BY +# taken from http://ccmixter.org/files/unreal_dm/38156 +Source2: unreal_dm-free.music.and.free.beer.ogg # Use libdir properly for Fedora multilib Patch1: xmms2-0.8DrO_o-use-libdir.patch # Set default output to pulse @@ -31,6 +35,8 @@ Patch8: xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch Patch9: xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch # Add support for OpenSSL 1.1 Patch10: xmms2-0.8DrO_o-openssl-1.1.patch +# Swap mind.in.a.box for free.music.and.free.beer +Patch11: xmms2-0.8DrO_o-no-mind.in.a.box.patch URL: http://wiki.xmms2.xmms.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel, flac-devel, libofa-devel @@ -128,6 +134,8 @@ it executes the command passed as argument directly. %patch7 -p1 -b .modplug_header %patch8 -p1 -b .vorbis_libs %patch10 -p1 -b .openssl11 +%patch11 -p1 -b .nomind +cp %{SOURCE2} . # This header doesn't need to be executable chmod -x src/include/xmmsclient/xmmsclient++/dict.h @@ -226,6 +234,9 @@ rm -rf %{buildroot} %{_bindir}/nyxmms2 %changelog +* Mon Nov 20 2017 Tom Callaway - 0.8-49 +- remove non-free ogg sample + * Fri Sep 1 2017 Tom Callaway - 0.8-48 - rebuild against fixed efl