Project import/amarok - Diff 08a8eedb9f...5e5a17b58b

... ... --- a/.abf.yml
... ... +++ b/.abf.yml
... ... @@ -1,3 +1,3 @@
1 1
sources:
2
  amarok-2.8.90.tar.xz: b9ca733e36eb7d2c1fec6cbcf82f40bb573aea44
2
  amarok-2.9.0.tar.xz: 85082c415db467c12a22dd555dfc8b4e770a8fed
3 3
  amarok.po.tar.gz: edc19d2673f288cb1b2a965783c3a97ad47e4aef
view file @ 08a8eedb9f
... ... --- a/amarok-2.8.0-ffmpeg3.0.patch
... ... +++ /dev/null
... ... @@ -1,56 +0,0 @@
0
--- src/musicbrainz/MusicDNSAudioDecoder.cpp.orig	2013-08-14 ‏‎22:22:52.000000000 +0200
1
+++ src/musicbrainz/MusicDNSAudioDecoder.cpp	2016-02-26 15:55:31.000000000 +0100
2
@@ -223,7 +223,7 @@
3
             {
4
                 if( !decodedFrame )
5
                 {
6
-                    decodedFrame = avcodec_alloc_frame();
7
+                    decodedFrame = av_frame_alloc();
8
                     if( !decodedFrame )
9
                     {
10
                         warning() << "Unable to allocate enough memory to decode file.";
11
@@ -231,7 +231,7 @@
12
                         break;
13
                     }
14
                     else
15
-                        avcodec_get_frame_defaults( decodedFrame );
16
+                        av_frame_unref( decodedFrame );
17
                 }
18
 
19
                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
20
@@ -341,7 +341,7 @@
21
             {
22
                 if( !decodedFrame )
23
                 {
24
-                    decodedFrame = avcodec_alloc_frame();
25
+                    decodedFrame = av_frame_alloc();
26
                     if( !decodedFrame )
27
                     {
28
                         warning() << "Unable to allocate enough memory to decode file.";
29
@@ -349,7 +349,7 @@
30
                         break;
31
                     }
32
                     else
33
-                        avcodec_get_frame_defaults( decodedFrame );
34
+                        av_frame_unref( decodedFrame );
35
                 }
36
 
37
                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
38
@@ -459,7 +459,7 @@
39
             {
40
                 if( !decodedFrame )
41
                 {
42
-                    decodedFrame = avcodec_alloc_frame();
43
+                    decodedFrame = av_frame_alloc();
44
                     if( !decodedFrame )
45
                     {
46
                         warning() << "Unable to allocate enough memory to decode file.";
47
@@ -467,7 +467,7 @@
48
                         break;
49
                     }
50
                     else
51
-                        avcodec_get_frame_defaults( decodedFrame );
52
+                        av_frame_unref( decodedFrame );
53
                 }
54
 
55
                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
view file @ 08a8eedb9f
... ... --- a/amarok-2.8.0-taglib-compare.patch
... ... +++ /dev/null
... ... @@ -1,32 +0,0 @@
0
Starting with taglib 1.10 we have to use VERSION_LESS, rather than STRLESS. Otherwise we get this error message:
1
- TagLib version too old: version searched :1.7, found 1.10
2
---
3
 cmake/modules/FindTaglib.cmake |    6 +++---
4
 1 file changed, 3 insertions(+), 3 deletions(-)
5
6
Index: amarok-2.8.0/cmake/modules/FindTaglib.cmake
7
===================================================================
8
--- amarok-2.8.0.orig/cmake/modules/FindTaglib.cmake
9
+++ amarok-2.8.0/cmake/modules/FindTaglib.cmake
10
@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
11
 
12
   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
13
 
14
-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
15
+  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
16
      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
17
      set(TAGLIB_FOUND FALSE)
18
-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
19
+  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
20
 
21
      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
22
 
23
@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
24
         set(TAGLIB_FOUND TRUE)
25
      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
26
      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
27
-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
28
+  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
29
   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
30
 
31
 else(TAGLIBCONFIG_EXECUTABLE)
view file @ 5e5a17b58b
... ... --- /dev/null
... ... +++ b/amarok-2.9.0-build-error.patch
... ... @@ -0,0 +1,13 @@
1
diff -Naur amarok-2.9.0-orig/src/playlist/proxymodels/SortAlgorithms.cpp amarok-2.9.0/src/playlist/proxymodels/SortAlgorithms.cpp
2
--- amarok-2.9.0-orig/src/playlist/proxymodels/SortAlgorithms.cpp	2018-02-28 21:52:33.000000000 +0300
3
+++ amarok-2.9.0/src/playlist/proxymodels/SortAlgorithms.cpp	2018-03-07 18:28:16.984127810 +0300
4
@@ -94,8 +94,7 @@
5
                     if( compareResult != 0 )
6
                         return ( compareResult < 0 ) != inverted;
7
 
8
-                    // Fall through to sorting by album artist if albums have same name
9
-                    __attribute__ ((fallthrough));
10
+                    break;
11
                 }
12
                 case Playlist::AlbumArtist:
13
                 {
... ... --- a/amarok.spec
... ... +++ b/amarok.spec
... ... @@ -2,18 +2,17 @@
2 2
3 3
Summary:	A powerful media player for KDE4
4 4
Name:		amarok
5
Version:	2.9.0
6
Release:	1
5 7
Epoch:		3
6
Version:	2.8.90
7
Release:	4
8 8
License:	GPLv2+
9 9
Group:		Sound
10 10
Url:		http://amarok.kde.org/
11 11
Source0:	http://fr2.rpmfind.net/linux/KDE/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz
12
Source1:        amarok.po.tar.gz
12
Source1:	amarok.po.tar.gz
13 13
Source100:	amarok.rpmlintrc
14 14
Patch0:		amarok-2.6.0-locale.patch
15
Patch1:		amarok-2.8.0-taglib-compare.patch
16
Patch2:		amarok-2.8.0-ffmpeg3.0.patch
15
Patch3:		amarok-2.9.0-build-error.patch
17 16
%if %{with clamz}
18 17
BuildRequires:	clamz
19 18
%endif
... ... @@ -89,13 +88,13 @@ with OpenGL are a great way to enhance your music experience.
88 88
%{_kde_bindir}/amarokmp3tunesharmonydaemon
89 89
%{_kde_bindir}/amarokpkg
90 90
%{_kde_bindir}/amzdownloader
91
%{_kde_datadir}/applications/kde4/amarok.desktop
92
%{_kde_datadir}/applications/kde4/amarok_containers.desktop
91
%{_kde_datadir}/applications/kde4/org.kde.amarok.desktop
92
%{_kde_datadir}/applications/kde4/org.kde.amarok_containers.desktop
93 93
%{_kde_datadir}/applications/kde4/amzdownloader.desktop
94 94
%{_kde_datadir}/config/amarok.knsrc
95 95
%{_kde_datadir}/config/amarok_homerc
96 96
%{_kde_datadir}/config.kcfg/amarokconfig.kcfg
97
%{_kde_datadir}/appdata/amarok.appdata.xml
97
%{_kde_datadir}/metainfo/org.kde.amarok.appdata.xml
98 98
%{_kde_appsdir}/desktoptheme/*
99 99
%{_kde_appsdir}/solid/actions/amarok-play-audiocd.desktop
100 100
%{_kde_appsdir}/amarok
... ... @@ -264,8 +263,7 @@ Headers of %{name} for development.
263 263
%prep
264 264
%setup -q
265 265
%patch0 -p1
266
%patch1 -p1
267
%patch2 -p0
266
%patch3 -p1
268 267
269 268
pushd po/ru
270 269
tar -xvzf %{SOURCE1}
... ... @@ -274,7 +272,7 @@ popd
272 272
%build
273 273
%cmake_kde4 -DKDE4_BUILD_TESTS=OFF
274 274
275
%make
275
%make -s
276 276
277 277
%install
278 278
%makeinstall_std -C build