[ffmpeg] drop patch, fixed upstream
by Leigh Scott
commit dff2eef58d18b80f04ffd09b1e3ef95ab7a4b26b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Oct 27 23:43:13 2016 +0100
drop patch, fixed upstream
ffmpeg.spec | 2 --
ffmpeg_opj2.patch | 36 ------------------------------------
2 files changed, 38 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index a9681ff..ea984a5 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -32,7 +32,6 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
-Patch0: %{name}_opj2.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: bzip2-devel
%{?_with_faac:BuildRequires: faac-devel}
@@ -233,7 +232,6 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
-%patch0 -p1 -b .opj2
# fix -O3 -g in host_cflags
sed -i "s|-O3 -g|$RPM_OPT_FLAGS|" configure
mkdir -p _doc/examples
7 years, 5 months
[ffmpeg] Fix source, it should be tar.xz archive
by Leigh Scott
commit 8d7697c58e330337ff649fe8fbd16edaaf1a4f78
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Oct 27 23:06:22 2016 +0100
Fix source, it should be tar.xz archive
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index 024b8c7..7c3610a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ ffmpeg-2.8.7.tar.xz
/ffmpeg-3.1.4.tar.bz2
/ffmpeg-3.1.4.tar.xz
/ffmpeg-3.1.5.tar.bz2
+/ffmpeg-3.1.5.tar.xz
diff --git a/sources b/sources
index bfd1344..e29d051 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0dd2f448a41f555a100fb075d5df136e ffmpeg-3.1.5.tar.bz2
+a09f7730ceeb665c6f7da0b884dd00f9 ffmpeg-3.1.5.tar.xz
7 years, 5 months
[mixxx/f23] Fix appdata (rfbz#4311)
by Leigh Scott
Summary of changes:
fce4372... Fix appdata (rfbz#4311) (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 5 months
[mixxx/f24] Fix appdata (rfbz#4311)
by Leigh Scott
Summary of changes:
fce4372... Fix appdata (rfbz#4311) (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 5 months
[mixxx/f25] Fix appdata (rfbz#4311)
by Leigh Scott
Summary of changes:
fce4372... Fix appdata (rfbz#4311) (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 5 months
[mixxx] Fix appdata (rfbz#4311)
by Leigh Scott
commit fce4372f15ede97a873eca6fc463fa6062c8f25b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Oct 27 22:37:12 2016 +0100
Fix appdata (rfbz#4311)
AppData_fix.patch | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
mixxx.spec | 7 ++++-
2 files changed, 96 insertions(+), 1 deletion(-)
---
diff --git a/AppData_fix.patch b/AppData_fix.patch
new file mode 100644
index 0000000..d655967
--- /dev/null
+++ b/AppData_fix.patch
@@ -0,0 +1,90 @@
+From 5b2fb4787b5b99fc7e914efca78c53302cf6541d Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard(a)hughsie.com>
+Date: Wed, 12 Oct 2016 12:05:39 +0100
+Subject: [PATCH] Fix the AppData file to actual validate
+
+Also, while we're here update the file to the latest spec level and match the
+style guide somewhat closer.
+---
+ res/linux/mixxx.appdata.xml | 59 ++++++++++++++++++++++++---------------------
+ 1 file changed, 31 insertions(+), 28 deletions(-)
+
+diff --git a/res/linux/mixxx.appdata.xml b/res/linux/mixxx.appdata.xml
+index 2f8575c..85498fc 100644
+--- a/res/linux/mixxx.appdata.xml
++++ b/res/linux/mixxx.appdata.xml
+@@ -5,43 +5,46 @@
+ <metadata_license>CC-BY-SA-3.0</metadata_license>
+ <project_license>GPL-2.0</project_license>
+ <name>Mixxx DJ Software</name>
+- <summary>Everything you need to perform live DJ mixes.</summary>
++ <summary>Everything you need to perform live DJ mixes</summary>
+ <description>
+- <p><b>Mixxx/</b> is free DJ software that gives you
+- everything you need to perform live DJ mixes. Blend songs together with
+- automatic BPM matching and remix on-the-fly with looping and hot cues.
++ <p>
++ Mixxx is free DJ software that gives you everything you need to perform
++ live DJ mixes. Blend songs together with automatic BPM matching and
++ remix on-the-fly with looping and hot cues.
+ Whether you're a pro DJ or just getting started, Mixxx has you covered.
+ </p>
+ <p>
+- <b>Mixxx</b> works with ALSA, JACK, OSS and supports many popular DJ
+- controllers.
++ Mixxx works with ALSA, JACK, OSS and supports many popular DJ
++ controllers. Key features include:
+ </p>
+- <b>KEY FEATURES</b>
+ <ul>
+- <li>Parallel or split scratchable waveform displays.</li>
+- <li>MP3, OGG, WAVE, FLAC, and optional AAC (M4A) playback.</li>
+- <li>WAVE, OGG, and optional MP3 recording.</li>
+- <li>Fast, database-powered library.</li>
+- <li>Crates and playlists for organizing your music.</li>
+- <li>Reads iTunes, Traktor, and Rhythmbox libraries.</li>
+- <li>Cross-platform - works on Windows, Mac OS X and Linux.</li>
+- <li>Shoutcast and Icecast broadcasting.</li>
+- <li>Support for many DJ MIDI and HID controllers out-of-the-box.</li>
+- <li>Advanced MIDI scripting engine for maximum flexibility.</li>
+- <li>Vinyl emulation with Serato, Traktor, and Mixvibes timecode support.</li>
+- <li>Beat and key detection.</li>
+- <li>ReplayGain volume normalization.</li>
+- <li>Automatic crossfading with Auto DJ.</li>
+- <li>Skinnable interface with several skins bundled.</li>
++ <li>Parallel or split scratchable waveform displays</li>
++ <li>MP3, OGG, WAVE, FLAC, and optional AAC (M4A) playback</li>
++ <li>WAVE, OGG, and optional MP3 recording</li>
++ <li>Fast, database-powered library</li>
++ <li>Crates and playlists for organizing your music</li>
++ <li>Reads iTunes, Traktor, and Rhythmbox libraries</li>
++ <li>Cross-platform - works on Windows, Mac OS X and Linux</li>
++ <li>Shoutcast and Icecast broadcasting</li>
++ <li>Support for many DJ MIDI and HID controllers out-of-the-box</li>
++ <li>Advanced MIDI scripting engine for maximum flexibility</li>
++ <li>Vinyl emulation with Serato, Traktor, and Mixvibes timecode support</li>
++ <li>Beat and key detection</li>
++ <li>ReplayGain volume normalization</li>
++ <li>Automatic crossfading with Auto DJ</li>
++ <li>Skinnable interface with several skins bundled</li>
+ </ul>
+- <p>For a full list of features go to:
+- <a href="http://mixxx.org/features/" target="_top">http://mixxx.org/features/</a>
+- </p>
+ </description>
+ <screenshots>
+- <screenshot type="default">http://www.mixxx.org/images/press_art/mixxx_1110_default_deere_skin.png</screenshot>
+- <caption>Mixxx 1.11.0 with the default Deere skin.</caption>
++ <screenshot type="default">
++ <image>http://www.mixxx.org/static/images/press_art/mixxx_200_deere_skin.png</image>
++ <caption>Mixxx with the default Deere skin</caption>
++ </screenshot>
+ </screenshots>
+ <url type="homepage">http://mixxx.org</url>
+- <updatecontact>mixxx-devel(a)lists.sourceforge.net</updatecontact>
++ <url type="bugtracker">https://bugs.launchpad.net/mixxx/</url>
++ <url type="donation">http://www.mixxx.org/support/</url>
++ <url type="help">http://www.mixxx.org/support/</url>
++ <url type="translate">https://www.transifex.com/mixxx-dj-software/public/</url>
++ <update_contact>mixxx-devel(a)lists.sourceforge.net</update_contact>
+ </component>
diff --git a/mixxx.spec b/mixxx.spec
index 90f9f74..0ce122e 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -5,7 +5,7 @@
Name: mixxx
Version: 2.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
@@ -15,6 +15,7 @@ Source0: http://downloads.mixxx.org/mixxx-%{version}/%{name}-%{version}-s
Patch0: %{name}-%{version}-build.patch
Patch1: %{name}-gcc6.patch
Patch2: %{name}-arm.patch
+Patch3: AppData_fix.patch
#Build tools
@@ -72,6 +73,7 @@ controllers including MIDI devices, and more.
%patch0 -p1
%patch1 -p1 -b .gcc6
%patch2 -p1
+%patch3 -p1
# TODO remove bundle libs
#rm -rf lib/vamp-2.3 lib/xwax lib/gmock-1.7.0 lib/gtest-1.7.0
@@ -126,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%{_datadir}/appdata/%{name}.appdata.xml
%changelog
+* Thu Oct 27 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.0-6
+- Fix appdata (rfbz#4311)
+
* Sun Aug 21 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 2.0.0-5
- Add udev rule (rfbz#4064)
7 years, 5 months
[mari0/f24] Fix for love 0.10.1
by Jeremy Newton
Summary of changes:
4fbb4bd... Fix for love 0.10.1 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 6 months
[mari0/f25] Fix for love 0.10.1
by Jeremy Newton
Summary of changes:
4fbb4bd... Fix for love 0.10.1 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 6 months
[mari0] Fix for love 0.10.1
by Jeremy Newton
commit 4fbb4bded8f2dc9c6441ad4a4ac85e904daf38dc
Author: Mystro256 <alexjnewt(a)hotmail.com>
Date: Wed Oct 26 22:35:56 2016 -0400
Fix for love 0.10.1
.gitignore | 1 +
mari0.spec | 30 +++++++++++++++---------------
sources | 2 +-
3 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e834368..f3b1ba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
mari0-fc23e18525c4d0c881e64268e56fd23773f006af.zip
+/5392efaf472ece528f70a87b006a7bf87ae018c5.tar.gz
diff --git a/mari0.spec b/mari0.spec
index 4258830..b8a1ea6 100644
--- a/mari0.spec
+++ b/mari0.spec
@@ -1,23 +1,20 @@
+%global githash 5392efaf472ece528f70a87b006a7bf87ae018c5
+
Name: mari0
Version: 1.6
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A recreation of the original Super Mario Bros with a portal gun
License: CC-BY-NC-SA
URL: http://stabyourself.net/mari0/
-#Source0 is the upstream source:
-#Updated by hacktivista, see github for details:
-#https://github.com/Hacktivista/mari0
-#Download here:
-#https://github.com/Hacktivista/mari0/archive/fc23e18525c4d0c881e64268e56fd23773f006af.zip
-Source0: %{name}-fc23e18525c4d0c881e64268e56fd23773f006af.zip
+Source0: https://github.com/Stabyourself/%{name}/archive/%{githash}.tar.gz
#Source1 is just a Desktop file:
Source1: %{name}.desktop
#BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
BuildArch: noarch
-Requires: love >= 0.9.0
+Requires: love >= 0.10.1
#Reworded from the website (see URL above)
%description
@@ -28,21 +25,21 @@ popular Value game, Portal. Mari0 also has a 4-player coop mode, with
everyone having their own Portal gun. This game is made with LOVE.
%prep
-%setup -q -c -n %{name}-fc23e18525c4d0c881e64268e56fd23773f006af
+%autosetup -n %{name}-%{githash}
+
+%build
+zip -r %{name}.zip `ls | grep -v "_DO NOT INCLUDE"`
#Execution Script:
echo -e "#!/bin/sh\nlove %{_datadir}/%{name}/%{name}.love\n" > %{name}
-%build
-#No Build Required
-
%install
-install -p -D -m 0644 %{name}-fc23e18525c4d0c881e64268e56fd23773f006af/%{name}.love %{buildroot}/%{_datadir}/%{name}/%{name}.love
-install -p -D -m 0755 %{name} %{buildroot}/%{_bindir}/%{name}
+install -p -D -m 0644 %{name}.zip %{buildroot}/%{_datadir}/%{name}/%{name}.love
+install -p -D -m 0755 %{name} %{buildroot}/%{_bindir}/%{name}
#Install desktop, icons:
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
-install -p -D -m 0644 "%{name}-fc23e18525c4d0c881e64268e56fd23773f006af/_DO NOT INCLUDE/icon.png" %{buildroot}/%{_datadir}/pixmaps/%{name}.png
+install -p -D -m 0644 "_DO NOT INCLUDE/icon.png" %{buildroot}/%{_datadir}/pixmaps/%{name}.png
%files
%{_bindir}/%{name}
@@ -51,6 +48,9 @@ install -p -D -m 0644 "%{name}-fc23e18525c4d0c881e64268e56fd23773f006af/_DO NOT
%{_datadir}/applications/%{name}.desktop
%changelog
+* Wed Oct 26 2016 Jeremy Newton <alexjnewt at hotmail dot com> - 1.6-6
+- Update to git version (fixes issue with love 0.10.*)
+
* Sun Nov 29 2015 Jeremy Newton <alexjnewt at hotmail dot com> - 1.6-5
- Update to work with love 0.9+
diff --git a/sources b/sources
index 357da75..09bf94d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9033ff81a8c007844f247cf932e55d6f mari0-fc23e18525c4d0c881e64268e56fd23773f006af.zip
+e600a67ee6f2f09632d446f25c838619 5392efaf472ece528f70a87b006a7bf87ae018c5.tar.gz
7 years, 6 months
