July 2016 - rpmfusion-commits

by Leigh Scott

Summary of changes: df7dcf8... fix bz4123 (*) 3231123... add patch (*) (*) This commit already existed in another branch; no separate mail sent

8 years, 4 months

1
0
0 / 0

[mac] add patch

by Leigh Scott

commit 32311234e1ba33582c8ef9fcdf618dcb0cd94e24 Author: leigh123linux <leigh123linux(a)googlemail.com> Date: Thu Jul 14 15:50:09 2016 +0100 add patch mac-4.11-u4-b5-s7-gcc6.patch | 98 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) --- diff --git a/mac-4.11-u4-b5-s7-gcc6.patch b/mac-4.11-u4-b5-s7-gcc6.patch new file mode 100644 index 0000000..07d4961 --- /dev/null +++ b/mac-4.11-u4-b5-s7-gcc6.patch @@ -0,0 +1,98 @@ +--- a/src/MACLib/APECompress.cpp ++++ b/src/MACLib/APECompress.cpp +@@ -3,6 +3,7 @@ + #include IO_HEADER_FILE + #include "APECompressCreate.h" + #include "WAVInputSource.h" ++#define min(a,b) (((a) < (b)) ? (a) : (b)) + + CAPECompress::CAPECompress() + { + +--- a/src/MACLib/APEDecompress.cpp ++++ b/src/MACLib/APEDecompress.cpp +@@ -7,6 +7,7 @@ + #include "NewPredictor.h" + + #define DECODE_BLOCK_SIZE 4096 ++#define min(a,b) (((a) < (b)) ? (a) : (b)) + + CAPEDecompress::CAPEDecompress(int * pErrorCode, CAPEInfo * pAPEInfo, int nStartBlock, int nFinishBlock) + { + +--- a/src/MACLib/APESimple.cpp ++++ b/src/MACLib/APESimple.cpp +@@ -14,6 +14,7 @@ + #define UNMAC_DECODER_OUTPUT_APE 2 + + #define BLOCKS_PER_DECODE 9216 ++#define min(a,b) (((a) < (b)) ? (a) : (b)) + + int DecompressCore(const str_utf16 * pInputFilename, const str_utf16 * pOutputFilename, int nOutputMode, int nCompressionLevel, IAPEProgressCallback * pProgressCallback); + + +--- a/src/MACLib/BitArray.cpp ++++ b/src/MACLib/BitArray.cpp +@@ -20,6 +20,8 @@ + #define SHIFT_BITS (CODE_BITS - 9) + #define EXTRA_BITS ((CODE_BITS - 2) % 8 + 1) + #define BOTTOM_VALUE (TOP_VALUE >> 8) ++#define min(a,b) (((a) < (b)) ? (a) : (b)) ++#define max(a,b) (((a) > (b)) ? (a) : (b)) + + /************************************************************************************ + Lookup tables + +--- a/src/MACLib/APETag.cpp ++++ b/src/MACLib/APETag.cpp +@@ -4,6 +4,7 @@ + #include "CharacterHelper.h" + #include "IO.h" + #include IO_HEADER_FILE ++#define max(a,b) (((a) > (b)) ? (a) : (b)) + + /***************************************************************************************** + CAPETagField + +--- a/src/MACLib/MACProgressHelper.cpp ++++ b/src/MACLib/MACProgressHelper.cpp +@@ -1,6 +1,7 @@ + #include "All.h" + #include "MACProgressHelper.h" + #include "MACLib.h" ++#define max(a,b) (((a) > (b)) ? (a) : (b)) + + CMACProgressHelper::CMACProgressHelper(int nTotalSteps, IAPEProgressCallback * pProgressCallback) + { + +--- a/src/MACLib/UnBitArray.cpp ++++ b/src/MACLib/UnBitArray.cpp +@@ -23,6 +23,7 @@ + #define BOTTOM_VALUE (TOP_VALUE >> 8) + + #define MODEL_ELEMENTS 64 ++#define max(a,b) (((a) > (b)) ? (a) : (b)) + + /*********************************************************************************** + Construction + +--- a/src/MACLib/Prepare.cpp ++++ b/src/MACLib/Prepare.cpp +@@ -1,5 +1,6 @@ + #include "All.h" + #include "Prepare.h" ++#define max(a,b) (((a) > (b)) ? (a) : (b)) + + const uint32 CRC32_TABLE[256] = {0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368, + 4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850, + +--- b/src/Shared/CircleBuffer.cpp ++++ b/src/Shared/CircleBuffer.cpp +@@ -1,5 +1,6 @@ + #include "All.h" + #include "CircleBuffer.h" ++#define min(a,b) (((a) < (b)) ? (a) : (b)) + + CCircleBuffer::CCircleBuffer() + { +

8 years, 4 months

1
0
0 / 0

[mac] fix bz4123

by Leigh Scott

commit df7dcf844c169d1255386fb7682948ea924a9216 Author: leigh123linux <leigh123linux(a)googlemail.com> Date: Thu Jul 14 15:49:05 2016 +0100 fix bz4123 .gitignore | 1 + License.htm | 44 ++++++++++++++++++++++ mac-3.99-u4-b5-analyse.patch | 25 ------------- mac-3.99-u4-b5-gcc44.patch | 27 -------------- mac-3.99-u4-b5-gcc45.patch | 9 ----- mac-3.99-u4-b5-gcc6.patch | 87 -------------------------------------------- mac.spec | 27 +++++++------- sources | 2 +- 8 files changed, 60 insertions(+), 162 deletions(-) --- diff --git a/.gitignore b/.gitignore index 545c721..bb3b048 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ mac-3.99-u4-b5.tar.gz +/monkeys-audio_4.11-u4-b5-s7.orig.tar.gz diff --git a/License.htm b/License.htm new file mode 100644 index 0000000..3081335 --- /dev/null +++ b/License.htm @@ -0,0 +1,44 @@ +<html> + +<head> +<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> +<meta name="GENERATOR" content="Microsoft FrontPage 4.0"> +<meta name="ProgId" content="FrontPage.Editor.Document"> +<title>Well</title> +</head> + +<body> + +Monkey's Audio Source Code +License Agreement +License Agreement +1. The Monkey's Audio SDK and source code can +be freely used to add APE format playback, encoding, or tagging support to any +product, free or commercial.  Use of the code for proprietary efforts that +don't support the official APE format require written consent of the author. +2. Monkey's Audio source can be included in GPL +and open-source software, although Monkey's Audio itself will not be subjected +to external licensing requirements or other viral source restrictions. +3. Code changes and improvements must be +contributed back to the Monkey's Audio project free from restrictions or +royalties for the sake of the common good, unless exempted by express written +consent of the author. +4. Any source code, ideas, or libraries used +must be plainly acknowledged in the software using the code. +5. Although the software has been tested thoroughly, the author is in no way responsible for damages due to +bugs or misuse.  +6. If you do not completely agree with all of +the previous stipulations, you must cease using this source code and remove it +from your storage device. +  +All +rights not expressly granted here are reserved by Matthew T. Ashland. +  +- +All materials and programs copyrighted �2000-2006 by Matthew T. Ashland - +- +All rights reserved. - + +</body> + +</html> diff --git a/mac.spec b/mac.spec index 063a4fe..5fe377e 100644 --- a/mac.spec +++ b/mac.spec @@ -1,17 +1,16 @@ Name: mac -Version: 3.99 -Release: 13.u4b5%{?dist} +Version: 4.11 +Release: 1.u4b5%{?dist} Summary: Monkey's Audio Codec (MAC) utility Group: Applications/Multimedia License: Monkey's Audio Source Code License Agreement URL: http://supermmx.org/linux/mac/ -Source0: http://supermmx.org/resources/linux/mac/mac-%{version}-u4-b5.tar.gz +# use debian multimedia source +Source0: ftp://ftp.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_%{ve... Source1: mac-permission_to_redistribute.txt -Patch0: mac-3.99-u4-b5-gcc44.patch -Patch1: mac-3.99-u4-b5-analyse.patch -Patch2: mac-3.99-u4-b5-gcc45.patch -Patch3: mac-3.99-u4-b5-gcc6.patch +Source2: License.htm +Patch0: mac-4.11-u4-b5-s7-gcc6.patch %ifarch i686 x86_64 BuildRequires: yasm @@ -56,14 +55,12 @@ developing applications that use %{name}. %prep -%setup -q -n %{name}-%{version}-u4-b5 -%patch0 -p1 -b .gcc44 -%patch1 -p1 -b .an -%patch2 -p1 -b .gcc45 -%patch3 -p1 -b .gcc6 +%setup -q -n monkeys-audio-%{version}-u4-b5-s7 +%patch0 -p1 -b .gcc6 #Copy permission to redistribute cp -p %{SOURCE1} . +cp -p %{SOURCE2} src/ # Fix encoding issues: for txtfile in src/Credits.txt ; do @@ -116,13 +113,17 @@ execstack -c $RPM_BUILD_ROOT%{_libdir}/libmac.so.2.0.0 %{_libdir}/*.so.* %files devel -%doc TODO src/Readme.htm src/Credits.txt src/History.txt +%doc TODO src/Credits.txt src/History.txt %{_includedir}/mac/ %{_libdir}/*.so %changelog +* Thu Jul 14 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 4.11-1.u4b5 +- fix bz4123 +- use monkeys-audio source from Debian multimedia + * Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.99-13.u4b5 - patch for gcc-6 diff --git a/sources b/sources index aa526c3..723ad17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75716b342e07deae58f56a2522362006 mac-3.99-u4-b5.tar.gz +c438547f6336f2eda3ca820c08664aea monkeys-audio_4.11-u4-b5-s7.orig.tar.gz

8 years, 4 months

1
0
0 / 0

[mixxx] git add mixxx-gcc6.patch

by Sérgio M. Basto

commit fe5b57bf23b1082ad8bb74ca6402fb9f3ba57165 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Thu Jul 14 04:30:08 2016 +0100 git add mixxx-gcc6.patch mixxx-gcc6.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) --- diff --git a/mixxx-gcc6.patch b/mixxx-gcc6.patch new file mode 100644 index 0000000..f56a548 --- /dev/null +++ b/mixxx-gcc6.patch @@ -0,0 +1,17 @@ +--- ./src/util/math.h.orig 2016-07-14 04:13:22.861482580 +0100 ++++ ./src/util/math.h 2016-07-14 04:15:36.966067224 +0100 +@@ -4,7 +4,13 @@ + // Causes MSVC to define M_PI and friends. + // http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx + #define _USE_MATH_DEFINES +-#include <cmath> ++#include <math.h> ++#include <cmath> ++// Note: Because of our fpclassify hack, we actualy need to inlude both, ++// the c and the c++ version of the math header. ++// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included ++// after our fpclassify hack ++ + #include <algorithm> + + #include "util/assert.h"

8 years, 4 months

1
0
0 / 0

[mixxx] Add gcc6 patch

by Sérgio M. Basto

commit 6c9f09aeaa6fdbaf6e2ade2010444e1ccccf9221 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Thu Jul 14 04:23:25 2016 +0100 Add gcc6 patch mixxx.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- diff --git a/mixxx.spec b/mixxx.spec index a4d1aac..6c35c94 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -5,7 +5,7 @@ Name: mixxx Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mixxx is open source software for DJ'ing Group: Applications/Multimedia @@ -13,6 +13,7 @@ License: GPLv2+ URL: http://www.mixxx.org Source0: http://downloads.mixxx.org/mixxx-%{version}/%{name}-%{version}-src.tar.gz Patch0: %{name}-%{version}-build.patch +Patch1: %{name}-gcc6.patch ExclusiveArch: i686 x86_64 @@ -68,10 +69,11 @@ controllers including MIDI devices, and more. %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .gcc6 # TODO remove bundle libs #rm -rf lib/vamp-2.3 lib/xwax lib/gmock-1.7.0 lib/gtest-1.7.0 - + %build export CFLAGS=$RPM_OPT_FLAGS @@ -118,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir} %{_datadir}/appdata/%{name}.appdata.xml %changelog +* Thu Jul 14 2016 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-3 +- Add gcc6 patch + * Tue Feb 09 2016 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-2 - Remove rpath in linkage, https://bugzilla.rpmfusion.org/show_bug.cgi?id=3873#c7

8 years, 4 months

1
0
0 / 0

[mixxx] update .gitignore

by Sérgio M. Basto

commit 4859b54e8b69e714335d383b3e7c3bb01edf7e99 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Thu Jul 14 03:53:51 2016 +0100 update .gitignore .gitignore | 1 + 1 file changed, 1 insertion(+) --- diff --git a/.gitignore b/.gitignore index e793a6d..53be74c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ mixxx-1.11.0-20130517bzr.tar.bz2 mixxx-1.11.0-src.tar.gz +/mixxx-2.0.0-src.tar.gz

8 years, 4 months

1
0
0 / 0

[pcsx2/f24] Add gcc6 patch

by Sérgio M. Basto

Summary of changes: 8042104... Add gcc6 patch (*) (*) This commit already existed in another branch; no separate mail sent

8 years, 4 months

1
0
0 / 0

[pcsx2] Add gcc6 patch

by Sérgio M. Basto

commit 804210435d5c1cf69dd4fa383606477eb83e48cc Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Thu Jul 14 03:22:32 2016 +0100 Add gcc6 patch pcsx2-gcc6.patch | 12 ++++++++++++ pcsx2.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) --- diff --git a/pcsx2-gcc6.patch b/pcsx2-gcc6.patch new file mode 100644 index 0000000..25e79f8 --- /dev/null +++ b/pcsx2-gcc6.patch @@ -0,0 +1,12 @@ +diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp +index b318909..38f506d 100644 +--- a/common/src/x86emitter/cpudetect.cpp ++++ b/common/src/x86emitter/cpudetect.cpp +@@ -16,6 +16,7 @@ + #include "PrecompiledHeader.h" + #include "cpudetect_internal.h" + #include "internal.h" ++#include "fxsrintrin.h" + + using namespace x86Emitter; + diff --git a/pcsx2.spec b/pcsx2.spec index 7961ed0..456983a 100644 --- a/pcsx2.spec +++ b/pcsx2.spec @@ -1,6 +1,6 @@ Name: pcsx2 Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Sony Playstation2 emulator License: GPLv3 URL: https://github.com/PCSX2/pcsx2 @@ -8,6 +8,7 @@ URL: https://github.com/PCSX2/pcsx2 #script download_pcsx2_1.4_tarball.sh contained in Source1 Source0: pcsx2.1.4.tar.gz Source1: download_pcsx2_1.4_tarball.sh +Patch1: pcsx2-gcc6.patch # PCSX2 does not support running as a 64 bit application. # http://code.google.com/p/pcsx2/wiki/ChrootAnd64bStatusLinux ExclusiveArch: i686 @@ -45,6 +46,7 @@ this emulator anyway. %prep %setup -q -n pcsx2-1.4 +%patch1 -p1 -b .gcc6 # To remove executable bits from man, doc and icon files chmod -x pcsx2/Docs/GPL.txt pcsx2/Docs/License.txt pcsx2/Docs/readme-Docs.txt pcsx2/Docs/PCSX2_FAQ.doc pcsx2/Docs/PCSX2_Readme.doc bin/docs/PCSX2.1 linux_various/PCSX2.xpm @@ -140,6 +142,9 @@ fi %changelog +* Thu Jul 14 2016 Sérgio Basto <sergio(a)serjux.com> - 1.4-2 +- Add gcc6 patch + * Thu Feb 11 2016 Giles Birchley <gbirchley(a)blueyonder.co.uk> -1.4-1 - Build for new release 1.4 - Drop patch pcsx2-1.3.1_fedora_cflags_opts.diff - cflag options now streamlined upstream

8 years, 4 months

1
0
0 / 0

[vdr-tvguideng] Added %{pname}-gcc6.patch

by Martin Gansser

commit d521fbddb5b2993591e5a10c7d8bfc9b3a783853 Author: Martin Gansser <mgansser(a)alice.de> Date: Wed Jul 13 22:02:25 2016 +0200 Added %{pname}-gcc6.patch clog | 2 ++ 1 file changed, 2 insertions(+) --- diff --git a/clog b/clog new file mode 100644 index 0000000..3ede9cc --- /dev/null +++ b/clog @@ -0,0 +1,2 @@ +Added %{pname}-gcc6.patch +

8 years, 4 months

1
0
0 / 0

[libmp3splt/f23] Update to 0.9.2 .

by Sérgio M. Basto

Summary of changes: 3b8573c... Update to 0.9.2 . (*) (*) This commit already existed in another branch; no separate mail sent

8 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits July 2016