Permalink
Browse files

Update to 2.8.0.

Submitted by:	jpaetzel@ via the KDE on FreeBSD mailing list
  • Loading branch information...
1 parent 0a66b2c commit 88c0ed2b72f5cb038db3f2c2e5841c65acc9bddd @rakuco rakuco committed Jul 21, 2014
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= amarok
-PORTVERSION= 2.7.0
-PORTREVISION= 7
+PORTVERSION= 2.8.0
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
@@ -1,2 +1,2 @@
-SHA256 (amarok-2.7.0.tar.bz2) = 39649075f77e73dc7e0c1842b93de870b2f400cfd008907791ee81055a075d49
-SIZE (amarok-2.7.0.tar.bz2) = 42873142
+SHA256 (amarok-2.8.0.tar.bz2) = f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6
+SIZE (amarok-2.8.0.tar.bz2) = 39950028
@@ -1,64 +0,0 @@
---- ./src/core-impl/collections/support/MemoryMeta.h.orig 2013-01-17 13:53:55.000000000 +0100
-+++ ./src/core-impl/collections/support/MemoryMeta.h 2013-02-06 02:39:05.627835135 +0100
-@@ -63,8 +63,8 @@
- public:
- Artist( const QString &name ) : MemoryMeta::Base( name ) {}
-
-- virtual QString name() const { return Base::name(); }
-- virtual Meta::TrackList tracks() { return Base::tracks(); }
-+ virtual QString name() const { return MemoryMeta::Base::name(); }
-+ virtual Meta::TrackList tracks() { return MemoryMeta::Base::tracks(); }
- };
-
- class Album : public Meta::Album, public Base
-@@ -87,7 +87,7 @@
- virtual Capabilities::Capability* createCapabilityInterface( Capabilities::Capability::Type type );
-
- /* Meta::Base virtual methods */
-- virtual QString name() const { return Base::name(); }
-+ virtual QString name() const { return MemoryMeta::Base::name(); }
-
- /* Meta::Album virtual methods */
- virtual bool isCompilation() const { return m_isCompilation; }
-@@ -96,7 +96,7 @@
-
- virtual bool hasAlbumArtist() const { return !m_albumArtist.isNull(); }
- virtual Meta::ArtistPtr albumArtist() const { return m_albumArtist; }
-- virtual Meta::TrackList tracks() { return Base::tracks(); }
-+ virtual Meta::TrackList tracks() { return MemoryMeta::Base::tracks(); }
-
- virtual bool hasImage( int /* size */ = 0 ) const { return !m_image.isNull(); }
- virtual QImage image( int size = 0 ) const;
-@@ -124,8 +124,8 @@
- public:
- Composer( const QString &name ) : MemoryMeta::Base( name ) {}
-
-- virtual QString name() const { return Base::name(); }
-- virtual Meta::TrackList tracks() { return Base::tracks(); }
-+ virtual QString name() const { return MemoryMeta::Base::name(); }
-+ virtual Meta::TrackList tracks() { return MemoryMeta::Base::tracks(); }
- };
-
- class Genre : public Meta::Genre, public Base
-@@ -133,8 +133,8 @@
- public:
- Genre( const QString &name ) : MemoryMeta::Base( name ) {}
-
-- virtual QString name() const { return Base::name(); }
-- virtual Meta::TrackList tracks() { return Base::tracks(); }
-+ virtual QString name() const { return MemoryMeta::Base::name(); }
-+ virtual Meta::TrackList tracks() { return MemoryMeta::Base::tracks(); }
- };
-
- class Year : public Meta::Year, public Base
-@@ -142,8 +142,8 @@
- public:
- Year( const QString &name ) : MemoryMeta::Base( name ) {}
-
-- virtual QString name() const { return Base::name(); }
-- virtual Meta::TrackList tracks() { return Base::tracks(); }
-+ virtual QString name() const { return MemoryMeta::Base::name(); }
-+ virtual Meta::TrackList tracks() { return MemoryMeta::Base::tracks(); }
- };
-
- class AMAROK_EXPORT Track : public Meta::Track
@@ -1,12 +0,0 @@
---- src/playlistgenerator/constraints/PlaylistFileSize.cpp.orig 2013-02-06 11:59:32.000000000 +0100
-+++ src/playlistgenerator/constraints/PlaylistFileSize.cpp 2013-02-06 11:57:56.000000000 +0100
-@@ -172,7 +172,7 @@
- case 2:
- return static_cast<quint64>( m_size ) * static_cast<quint64>( 1000000000 );
- case 3:
-- return static_cast<quint64>( m_size ) * static_cast<quint64>( 1000000000000 );
-+ return static_cast<quint64>( m_size ) * static_cast<quint64>( 1000000000000LL );
- default:
- return static_cast<quint64>( m_size ) * static_cast<quint64>( 1 );
- }
-
@@ -0,0 +1,19 @@
+If this is not defined, libavutil/common.h fails because of this check:
+
+#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS) && !defined(UINT64_C)
+#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS
+#endif
+
+Not submitted upstream, as newer releases build with -std=c++0x, which always
+sets __STD_CONSTANT_MACROS by default.
+--- src/musicbrainz/MusicDNSAudioDecoder.cpp.orig 2014-07-21 16:48:11.000000000 +0300
++++ src/musicbrainz/MusicDNSAudioDecoder.cpp 2014-07-21 16:49:04.000000000 +0300
+@@ -14,6 +14,8 @@
+ * this program. If not, see <http://www.gnu.org/licenses/>. *
+ ****************************************************************************************/
+
++#define __STDC_CONSTANT_MACROS
++
+ #define DEBUG_PREFIX "MusicDNSAudioDecoder"
+
+ #include "MusicDNSAudioDecoder.h"
Oops, something went wrong.

0 comments on commit 88c0ed2

Please sign in to comment.