svn commit: r489228 - in head/audio: clementine-player clementine-player/files libechonest
Sean Bruno
sbruno at FreeBSD.org
Thu Jan 3 21:44:00 UTC 2019
Author: sbruno
Date: Thu Jan 3 21:43:57 2019
New Revision: 489228
URL: https://svnweb.freebsd.org/changeset/ports/489228
Log:
audio/clementine-player: Jump to qt5
- regenerate some of the patch files for this new branch
- cleanup and try to adjust Makefile
audio/libechonest: Jump to qt5
- clementine-player is the only port that I could find that has an explicit
dependency on libechonest. Commit this update so there is no window for
build failures.
Test built on 13-CURRENT, 12-STABLE, 11-STABLE across i386 and amd64.
Run-time tested on 13-CURRENT, amd64.
PR: 234534 226529
Submitted by: greg at unrelenting.technology
Added:
head/audio/clementine-player/files/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser.cpp (contents, props changed)
head/audio/clementine-player/files/patch-3rdparty_libprojectm_Renderer_VideoEcho.cpp (contents, props changed)
Deleted:
head/audio/clementine-player/files/patch-3rdParty_libprojectm_MilkdropPresetFactory_Parser.cpp
head/audio/clementine-player/files/patch-3rdParty_libprojectm_Renderer_VideoEcho.cpp
Modified:
head/audio/clementine-player/Makefile
head/audio/clementine-player/distinfo
head/audio/clementine-player/files/patch-CMakeLists.txt
head/audio/clementine-player/files/patch-dist_clementine.desktop
head/audio/clementine-player/files/patch-src_CMakeLists.txt
head/audio/clementine-player/pkg-plist
head/audio/libechonest/Makefile
head/audio/libechonest/pkg-plist
Modified: head/audio/clementine-player/Makefile
==============================================================================
--- head/audio/clementine-player/Makefile Thu Jan 3 21:40:51 2019 (r489227)
+++ head/audio/clementine-player/Makefile Thu Jan 3 21:43:57 2019 (r489228)
@@ -2,64 +2,61 @@
# $FreeBSD$
PORTNAME= clementine
-DISTVERSIONPREFIX= v
-DISTVERSION= 1.3.1-441
-DISTVERSIONSUFFIX= -gc01b7bc
-PORTREVISION= 7
+DISTVERSION= 1.3.1.g20190103
CATEGORIES= audio
PKGNAMESUFFIX= -player
+MASTER_SITES= GH
+
MAINTAINER= sbruno at FreeBSD.org
COMMENT= Cross-platform music player based on Amarok 1.4
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-DEPRECATED= Qt4 has been EOL since december 2015
-EXPIRATION_DATE= 2019-03-15
-
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
LIB_DEPENDS= libtag.so:audio/taglib \
libchromaprint.so:audio/chromaprint \
libprotobuf.so:devel/protobuf \
- libqca.so:devel/qca at qt4 \
- libqjson.so:devel/qjson at qt4 \
+ libqca-qt5.so:devel/qca at qt5 \
+ libqjson-qt5.so:devel/qjson at qt5 \
libfftw3.so:math/fftw3 \
- libechonest.so:audio/libechonest \
+ libechonest5.so:audio/libechonest \
libcryptopp.so:security/cryptopp
BROKEN_powerpc64= fails to compile: tagreader.cpp: undefined reference to TagLib::String::String
USE_GITHUB= yes
-GH_ACCOUNT= ${PORTNAME}${PKGNAMESUFFIX}
-GH_PROJECT= Clementine
+GH_TUPLE= clementine-player:Clementine:4ff370c
USES= cmake \
compiler:c++11-lib \
desktop-file-utils \
gettext-tools \
pkgconfig \
- qt:4 sqlite
+ qt:5 \
+ sqlite \
+ gl
+
USE_CXXSTD= c++11
USE_GL= gl glew glu
USE_XORG= x11
-CONFLICTS_BUILD= qt-3.*
-USE_QT= corelib \
+USE_QT= buildtools \
+ concurrent \
+ core \
dbus \
gui \
imageformats \
- qmake_build \
linguist_build \
- moc_build \
network \
opengl \
- qtestlib \
- rcc_build \
+ qmake_build \
+ testlib \
sql \
- uic_build \
- webkit \
+ widgets \
+ x11extras \
xml
USE_GSTREAMER1= cdparanoia \
@@ -70,6 +67,7 @@ USE_GSTREAMER1= cdparanoia \
lame \
mpg123 \
neon \
+ opus \
shout2 \
soup \
taglib \
@@ -86,6 +84,7 @@ CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/l
-DENABLE_DBUS=ON \
-DENABLE_SPOTIFY_BLOB=OFF
+OPTIONS_SUB= yes
OPTIONS_DEFINE= AMAZON \
AUDIOCD \
BOX \
@@ -103,7 +102,6 @@ OPTIONS_DEFINE= AMAZON \
VISUALISATION \
WIIMOTEDEV
-OPTIONS_SUB= yes
AMAZON_DESC= Amazon Drive support
AUDIOCD_DESC= Devices: Audio CD support
@@ -158,6 +156,7 @@ DROPBOX_BUILD_DEPENDS= sparsehash>=2.0.2:devel/sparseh
DROPBOX_CMAKE_ON= -DENABLE_DROPBOX=ON
DROPBOX_CMAKE_OFF= -DENABLE_DROPBOX=OFF
+GIO_USES= gnome
GIO_USE= GNOME=glib20
GIO_CMAKE_ON= -DENABLE_GIO=ON
GIO_CMAKE_OFF= -DENABLE_GIO=OFF
@@ -173,7 +172,7 @@ GPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \
GPOD_CMAKE_ON= -DENABLE_LIBGPOD=ON
GPOD_CMAKE_OFF= -DENABLE_LIBGPOD=OFF
-LASTFM_LIB_DEPENDS= liblastfm.so:audio/liblastfm
+LASTFM_LIB_DEPENDS= liblastfm5.so:audio/liblastfm-qt5
LASTFM_CMAKE_ON= -DENABLE_LIBLASTFM=ON
LASTFM_CMAKE_OFF= -DENABLE_LIBLASTFM=OFF
Modified: head/audio/clementine-player/distinfo
==============================================================================
--- head/audio/clementine-player/distinfo Thu Jan 3 21:40:51 2019 (r489227)
+++ head/audio/clementine-player/distinfo Thu Jan 3 21:43:57 2019 (r489228)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527263085
-SHA256 (clementine-player-Clementine-v1.3.1-441-gc01b7bc_GH0.tar.gz) = 78082a523dc21b6ddf17fd7bd3ab7734634bce93dacdc1a50efb4dda4e346be6
-SIZE (clementine-player-Clementine-v1.3.1-441-gc01b7bc_GH0.tar.gz) = 8468459
+TIMESTAMP = 1546525193
+SHA256 (clementine-player-Clementine-1.3.1.g20190103-4ff370c_GH0.tar.gz) = 3eeabfce6db7bb02db8387bf287352b819d0e8fb3534574bc4f1cb04f8a4e4e4
+SIZE (clementine-player-Clementine-1.3.1.g20190103-4ff370c_GH0.tar.gz) = 8522595
Added: head/audio/clementine-player/files/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/clementine-player/files/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser.cpp Thu Jan 3 21:43:57 2019 (r489228)
@@ -0,0 +1,47 @@
+--- 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp.orig 2018-12-05 17:16:34 UTC
++++ 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp
+@@ -1373,7 +1373,7 @@ PerFrameEqn * Parser::parse_implicit_per_frame_eqn(std
+ PerFrameEqn * per_frame_eqn;
+ GenExpr * gen_expr;
+
+- if (fs == NULL)
++ if (!fs)
+ return NULL;
+ if (param_string == NULL)
+ return NULL;
+@@ -1528,7 +1528,7 @@ InitCond * Parser::parse_per_frame_init_eqn(std::istre
+
+ if (preset == NULL)
+ return NULL;
+- if (fs == NULL)
++ if (!fs)
+ return NULL;
+
+ if ((token = parseToken(fs, name)) != tEq)
+@@ -1842,7 +1842,7 @@ int Parser::parse_shapecode(char * token, std::istream
+ /* Null argument checks */
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (!fs)
+ return PROJECTM_FAILURE;
+ if (token == NULL)
+ return PROJECTM_FAILURE;
+@@ -2133,7 +2133,7 @@ int Parser::parse_wave(char * token, std::istream & f
+
+ if (token == NULL)
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (!fs)
+ return PROJECTM_FAILURE;
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
+@@ -2315,7 +2315,7 @@ int Parser::parse_shape(char * token, std::istream &
+ if (token == NULL)
+
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (!fs)
+ return PROJECTM_FAILURE;
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
Added: head/audio/clementine-player/files/patch-3rdparty_libprojectm_Renderer_VideoEcho.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/clementine-player/files/patch-3rdparty_libprojectm_Renderer_VideoEcho.cpp Thu Jan 3 21:43:57 2019 (r489228)
@@ -0,0 +1,17 @@
+--- 3rdparty/libprojectm/Renderer/VideoEcho.cpp.orig 2018-12-05 17:16:34 UTC
++++ 3rdparty/libprojectm/Renderer/VideoEcho.cpp
+@@ -77,10 +77,10 @@ void VideoEcho::Draw(RenderContext &context)
+ default: flipx=1;flipy=1; break;
+ }
+
+- float pointsFlip[4][2] = {{-0.5*flipx, -0.5*flipy},
+- {-0.5*flipx, 0.5*flipy},
+- { 0.5*flipx, 0.5*flipy},
+- { 0.5*flipx, -0.5*flipy}};
++ float pointsFlip[4][2] = {{static_cast<float>(-0.5)*flipx, static_cast<float>(-0.5)*flipy},
++ {static_cast<float>(-0.5)*flipx, static_cast<float>(0.5)*flipy},
++ { static_cast<float>(0.5)*flipx, static_cast<float>(0.5)*flipy},
++ { static_cast<float>(0.5)*flipx, static_cast<float>(-0.5)*flipy}};
+
+ glVertexPointer(2,GL_FLOAT,0,pointsFlip);
+ glDrawArrays(GL_TRIANGLE_FAN,0,4);
Modified: head/audio/clementine-player/files/patch-CMakeLists.txt
==============================================================================
--- head/audio/clementine-player/files/patch-CMakeLists.txt Thu Jan 3 21:40:51 2019 (r489227)
+++ head/audio/clementine-player/files/patch-CMakeLists.txt Thu Jan 3 21:43:57 2019 (r489228)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2018-08-17 05:31:45 UTC
+--- CMakeLists.txt.orig 2018-12-05 17:16:34 UTC
+++ CMakeLists.txt
-@@ -59,7 +59,7 @@ find_library(PROTOBUF_STATIC_LIBRARY libprotobuf.a lib
+@@ -58,7 +58,7 @@ find_library(PROTOBUF_STATIC_LIBRARY libprotobuf.a lib
pkg_check_modules(CDIO libcdio)
pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
Modified: head/audio/clementine-player/files/patch-dist_clementine.desktop
==============================================================================
--- head/audio/clementine-player/files/patch-dist_clementine.desktop Thu Jan 3 21:40:51 2019 (r489227)
+++ head/audio/clementine-player/files/patch-dist_clementine.desktop Thu Jan 3 21:43:57 2019 (r489228)
@@ -1,6 +1,6 @@
---- dist/clementine.desktop.orig 2016-04-19 15:08:35 UTC
+--- dist/clementine.desktop.orig 2018-12-05 17:16:34 UTC
+++ dist/clementine.desktop
-@@ -26,8 +26,8 @@ Comment[sr]=РепÑодÑкÑÑе мÑÐ
+@@ -31,8 +31,8 @@ Comment[sr]=РепÑодÑкÑÑе мÑÐ·Ð¸ÐºÑ Ð¸ las
Comment[sr at ijekavian]=РепÑодÑкÑÑе мÑÐ·Ð¸ÐºÑ Ð¸ last.fm Ñокове
Comment[sr at ijekavianlatin]=Reprodukuje muziku i last.fm tokove
Comment[sr at latin]=Reprodukuje muziku i last.fm tokove
Modified: head/audio/clementine-player/files/patch-src_CMakeLists.txt
==============================================================================
--- head/audio/clementine-player/files/patch-src_CMakeLists.txt Thu Jan 3 21:40:51 2019 (r489227)
+++ head/audio/clementine-player/files/patch-src_CMakeLists.txt Thu Jan 3 21:43:57 2019 (r489228)
@@ -1,18 +1,18 @@
---- src/CMakeLists.txt.orig 2018-05-23 13:23:53 UTC
+--- src/CMakeLists.txt.orig 2018-12-05 17:16:34 UTC
+++ src/CMakeLists.txt
-@@ -1295,6 +1295,7 @@ if(HAVE_BREAKPAD)
- endif(HAVE_BREAKPAD)
+@@ -1319,6 +1319,7 @@ if(HAVE_SPOTIFY)
+ endif(HAVE_SPOTIFY)
if(HAVE_SPOTIFY_DOWNLOADER)
+ add_definitions(${CRYPTOPP_CFLAGS_OTHER})
target_link_libraries(clementine_lib
${CRYPTOPP_LIBRARIES}
)
-@@ -1380,6 +1381,7 @@ add_executable(clementine
+@@ -1407,6 +1408,7 @@ add_executable(clementine
- if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ if (FREEBSD)
target_link_libraries(clementine execinfo)
+ set_target_properties(clementine PROPERTIES OUTPUT_NAME clementine-player)
- endif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ endif (FREEBSD)
target_link_libraries(clementine
Modified: head/audio/clementine-player/pkg-plist
==============================================================================
--- head/audio/clementine-player/pkg-plist Thu Jan 3 21:40:51 2019 (r489227)
+++ head/audio/clementine-player/pkg-plist Thu Jan 3 21:43:57 2019 (r489228)
@@ -1,14 +1,14 @@
bin/clementine-player
bin/clementine-tagreader
-share/appdata/clementine.appdata.xml
share/applications/clementine.desktop
share/icons/hicolor/128x128/apps/clementine.png
share/icons/hicolor/64x64/apps/clementine.png
share/icons/hicolor/scalable/apps/clementine.svg
-share/kde4/services/clementine-feed.protocol
-share/kde4/services/clementine-itms.protocol
-share/kde4/services/clementine-itpc.protocol
-share/kde4/services/clementine-zune.protocol
+share/kservices5/clementine-feed.protocol
+share/kservices5/clementine-itms.protocol
+share/kservices5/clementine-itpc.protocol
+share/kservices5/clementine-zune.protocol
+share/metainfo/clementine.appdata.xml
%%VISUALISATION%%%%DATADIR%%/projectm-presets/Aderrasi - Agitator.milk
%%VISUALISATION%%%%DATADIR%%/projectm-presets/Aderrasi - Aimless (Gravity Directive Mix).milk
%%VISUALISATION%%%%DATADIR%%/projectm-presets/Aderrasi - Aimless (Spirogravity Mix).milk
Modified: head/audio/libechonest/Makefile
==============================================================================
--- head/audio/libechonest/Makefile Thu Jan 3 21:40:51 2019 (r489227)
+++ head/audio/libechonest/Makefile Thu Jan 3 21:43:57 2019 (r489228)
@@ -3,7 +3,7 @@
PORTNAME= libechonest
PORTVERSION= 2.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MAINTAINER= nivit at FreeBSD.org
@@ -12,23 +12,21 @@ COMMENT= Collection of C++/Qt classes designed to use
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-DEPRECATED= Qt4 has been EOL since december 2015
-EXPIRATION_DATE= 2019-03-15
+LIB_DEPENDS= libqjson-qt5.so:devel/qjson at qt5
-LIB_DEPENDS= libqjson.so:devel/qjson at qt4
-
+USES= cmake qt:5 pkgconfig
+USE_LDCONFIG= yes
+USE_GITHUB= yes
GH_ACCOUNT= lfranchi
-OPTIONS_DEFINE= TEST
+USE_QT= core buildtools_build qmake_build network xml
+CMAKE_OFF+= BUILD_WITH_QT4
PLIST_SUB= PORTVERSION=${PORTVERSION}
-TEST_CMAKE_BOOL=ECHONEST_BUILD_TESTS
-TEST_USE= qt=qtestlib_build,xml_build
+OPTIONS_DEFINE= TEST
-USES= cmake pkgconfig qt:4
-USE_GITHUB= yes
-USE_LDCONFIG= yes
-USE_QT= corelib qmake_build moc_build network rcc_build
+TEST_USE= QT5=testlib_build
+TEST_CMAKE_BOOL=ECHONEST_BUILD_TESTS
.include <bsd.port.mk>
Modified: head/audio/libechonest/pkg-plist
==============================================================================
--- head/audio/libechonest/pkg-plist Thu Jan 3 21:40:51 2019 (r489227)
+++ head/audio/libechonest/pkg-plist Thu Jan 3 21:43:57 2019 (r489228)
@@ -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/echonest5/Artist.h
+include/echonest5/ArtistTypes.h
+include/echonest5/AudioSummary.h
+include/echonest5/Catalog.h
+include/echonest5/CatalogArtist.h
+include/echonest5/CatalogItem.h
+include/echonest5/CatalogSong.h
+include/echonest5/CatalogUpdateEntry.h
+include/echonest5/CommonTypes.h
+include/echonest5/Config.h
+include/echonest5/Genre.h
+include/echonest5/Playlist.h
+include/echonest5/Song.h
+include/echonest5/Track.h
+include/echonest5/TypeInformation.h
+include/echonest5/Util.h
+include/echonest5/echonest_export.h
+lib/libechonest5.so
+lib/libechonest5.so.2
+lib/libechonest5.so.%%PORTVERSION%%
+libdata/pkgconfig/libechonest5.pc
More information about the svn-ports-head
mailing list