Attachment 192591 Details for Bug 226529 – libechonest-qt5.patch v2 (FLAVORS)

[patch] libechonest-qt5.patch v2 (FLAVORS)

libechonest-qt5.patch (text/plain), 3.93 KB, created by Val Packett on 2018-04-17 12:36:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2018-04-17 12:36:38 UTC

Size: 3.93 KB

patch

obsolete

>diff --git c/audio/clementine-player/Makefile i/audio/clementine-player/Makefile
>index e3174af33e66..2322b15b6d61 100644
>--- c/audio/clementine-player/Makefile
>+++ i/audio/clementine-player/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	clementine
> PORTVERSION=	1.3.1
>-PORTREVISION=	20
>+PORTREVISION=	21
> CATEGORIES=	audio
> PKGNAMESUFFIX=	-player
> 
>@@ -20,7 +20,7 @@ LIB_DEPENDS=	libtag.so:audio/taglib \
> 		libqca.so:devel/qca@qt4 \
> 		libqjson.so:devel/qjson@qt4 \
> 		libfftw3.so:math/fftw3 \
>-		libechonest.so:audio/libechonest \
>+		libechonest.so:audio/libechonest@qt4 \
> 		libcryptopp.so:security/cryptopp
> 
> BROKEN_powerpc64=	fails to compile: tagreader.cpp: undefined reference to TagLib::String::String
>diff --git c/audio/libechonest/Makefile i/audio/libechonest/Makefile
>index 6e273067c230..3a1ccae0f1b6 100644
>--- c/audio/libechonest/Makefile
>+++ i/audio/libechonest/Makefile
>@@ -3,8 +3,9 @@
> 
> PORTNAME=	libechonest
> PORTVERSION=	2.3.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	audio
>+PKGNAMESUFFIX=	-${FLAVOR}
> 
> MAINTAINER=	nivit@FreeBSD.org
> COMMENT=	Collection of C++/Qt classes designed to use the APIs of The Echo Nest
>@@ -12,20 +13,34 @@ COMMENT=	Collection of C++/Qt classes designed to use the APIs of The Echo Nest
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libqjson.so:devel/qjson@qt4
>+FLAVORS=	qt4 qt5
>+FLAVOR?=	${FLAVORS:[1]}
> 
>+USES=		cmake pkgconfig
>+USE_LDCONFIG=	yes
>+USE_GITHUB=	yes
> GH_ACCOUNT=	lfranchi
> 
>+.if ${FLAVOR} == qt4
>+USE_QT4=	corelib qmake_build moc_build network xml rcc_build
>+LIB_DEPENDS=	libqjson.so:devel/qjson@qt4
>+CMAKE_ON+=	BUILD_WITH_QT4
>+.else
>+USE_QT5=	core buildtools_build qmake_build network
>+LIB_DEPENDS=	libqjson-qt5.so:devel/qjson@qt5
>+CMAKE_OFF+=	BUILD_WITH_QT4
>+QTVER_SUFFIX=	5
>+.endif
>+
>+PLIST_SUB=	PORTVERSION=${PORTVERSION} QTVER_SUFFIX="${QTVER_SUFFIX}"
>+
> OPTIONS_DEFINE=	TEST
> 
>-PLIST_SUB=	PORTVERSION=${PORTVERSION}
>-
>+.if ${FLAVOR} == qt4
>+TEST_USE=	QT4=qtestlib_build
>+.else
>+TEST_USE=	QT5=testlib_build
>+.endif
> TEST_CMAKE_BOOL=ECHONEST_BUILD_TESTS
>-TEST_USE=	qt4=qtestlib_build,xml_build
>-
>-USES=		cmake pkgconfig
>-USE_GITHUB=	yes
>-USE_LDCONFIG=	yes
>-USE_QT4=	corelib qmake_build moc_build network rcc_build
> 
> .include <bsd.port.mk>
>diff --git c/audio/libechonest/pkg-plist i/audio/libechonest/pkg-plist
>index d86c408ed795..c82507878fa5 100644
>--- c/audio/libechonest/pkg-plist
>+++ i/audio/libechonest/pkg-plist
>@@ -1,21 +1,21 @@
>-include/echonest/Artist.h
>-include/echonest/ArtistTypes.h
>-include/echonest/AudioSummary.h
>-include/echonest/Catalog.h
>-include/echonest/CatalogArtist.h
>-include/echonest/CatalogItem.h
>-include/echonest/CatalogSong.h
>-include/echonest/CatalogUpdateEntry.h
>-include/echonest/CommonTypes.h
>-include/echonest/Config.h
>-include/echonest/Genre.h
>-include/echonest/Playlist.h
>-include/echonest/Song.h
>-include/echonest/Track.h
>-include/echonest/TypeInformation.h
>-include/echonest/Util.h
>-include/echonest/echonest_export.h
>-lib/libechonest.so
>-lib/libechonest.so.2
>-lib/libechonest.so.%%PORTVERSION%%
>-libdata/pkgconfig/libechonest.pc
>+include/echonest%%QTVER_SUFFIX%%/Artist.h
>+include/echonest%%QTVER_SUFFIX%%/ArtistTypes.h
>+include/echonest%%QTVER_SUFFIX%%/AudioSummary.h
>+include/echonest%%QTVER_SUFFIX%%/Catalog.h
>+include/echonest%%QTVER_SUFFIX%%/CatalogArtist.h
>+include/echonest%%QTVER_SUFFIX%%/CatalogItem.h
>+include/echonest%%QTVER_SUFFIX%%/CatalogSong.h
>+include/echonest%%QTVER_SUFFIX%%/CatalogUpdateEntry.h
>+include/echonest%%QTVER_SUFFIX%%/CommonTypes.h
>+include/echonest%%QTVER_SUFFIX%%/Config.h
>+include/echonest%%QTVER_SUFFIX%%/Genre.h
>+include/echonest%%QTVER_SUFFIX%%/Playlist.h
>+include/echonest%%QTVER_SUFFIX%%/Song.h
>+include/echonest%%QTVER_SUFFIX%%/Track.h
>+include/echonest%%QTVER_SUFFIX%%/TypeInformation.h
>+include/echonest%%QTVER_SUFFIX%%/Util.h
>+include/echonest%%QTVER_SUFFIX%%/echonest_export.h
>+lib/libechonest%%QTVER_SUFFIX%%.so
>+lib/libechonest%%QTVER_SUFFIX%%.so.2
>+lib/libechonest%%QTVER_SUFFIX%%.so.%%PORTVERSION%%
>+libdata/pkgconfig/libechonest%%QTVER_SUFFIX%%.pc

Actions: View | Diff

Attachments on bug 226529: 191423 | 192591 | 200663