Bug 234534 - audio/clementine-player: Update to qt5 version
Summary: audio/clementine-player: Update to qt5 version
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Sean Bruno
URL:
Keywords: needs-patch
Depends on: 226529
Blocks:
  Show dependency treegraph
 
Reported: 2018-12-31 19:41 UTC by Greg V
Modified: 2019-01-03 21:46 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (sbruno)


Attachments
clementine-qt5.patch (8.40 KB, patch)
2018-12-31 19:41 UTC, Greg V
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Greg V 2018-12-31 19:41:11 UTC
Created attachment 200664 [details]
clementine-qt5.patch

Requires libechonest qt5 patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226529
Comment 1 Sean Bruno freebsd_committer 2019-01-02 14:23:46 UTC
Why does the patch change the origin to a third party repo (yours?) instead of using the QT5 branch from the clementine player project?

I've started a phabricator review for this conversion here:

https://reviews.freebsd.org/D17891

Its out of date, but that's where I'd like to track this change.
Comment 2 Greg V 2019-01-02 14:26:44 UTC
(In reply to Sean Bruno from comment #1)
Does it?

> GH_PROJECT=	Clementine

You might be looking at PATCH_SITES, that's downloading a third party patch to fix the build: https://github.com/clementine-player/Clementine/pull/6246
Comment 3 Sean Bruno freebsd_committer 2019-01-02 14:34:50 UTC
(In reply to Greg V from comment #2)
Oh maybe.  Yeah.

Let me give this a spin after seeing how different it is from mine and then commit it if it does all the things.
Comment 4 Sean Bruno freebsd_committer 2019-01-02 17:37:20 UTC
I don't seem to need this code block when building on -current.  Is it there to fix bad detection of libcryptocpp or is it for older releases?

@@ -84,7 +81,16 @@ CFLAGS+=	-Wno-inconsistent-missing-override \
 
 CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \
 		-DENABLE_DBUS=ON \
-		-DENABLE_SPOTIFY_BLOB=OFF
+		-DENABLE_SPOTIFY_BLOB=OFF \
+		-DCRYPTOPP_LIBS=${LOCALBASE}/lib/libcryptopp.so \
+		-DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
+		-DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \
+		-DCRYPTOPP_LDFLAGS=-lcryptopp \
+		-DCRYPTOPP_LIBRARIES=cryptopp \
+		-DCRYPTOPP_LIBRARY_DIRS=${LOCALBASE}/lib \
+		-DCRYPTOPP_cryptopp_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
+		-DCRYPTOPP_cryptopp_LIBDIR=${LOCALBASE}/lib \
+		-DCRYPTOPP_FOUND=1
Comment 5 commit-hook freebsd_committer 2019-01-03 21:44:30 UTC
A commit references this bug:

Author: sbruno
Date: Thu Jan  3 21:43:59 UTC 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@unrelenting.technology

Changes:
  head/audio/clementine-player/Makefile
  head/audio/clementine-player/distinfo
  head/audio/clementine-player/files/patch-3rdParty_libprojectm_MilkdropPresetFactory_Parser.cpp
  head/audio/clementine-player/files/patch-3rdParty_libprojectm_Renderer_VideoEcho.cpp
  head/audio/clementine-player/files/patch-3rdparty_libprojectm_MilkdropPresetFactory_Parser.cpp
  head/audio/clementine-player/files/patch-3rdparty_libprojectm_Renderer_VideoEcho.cpp
  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
Comment 6 Sean Bruno freebsd_committer 2019-01-03 21:46:34 UTC
Greg:

Thank you for your outstanding work.  If you think that my commit is insufficient or defective, let me know what needs to be changed further.  For now, I'm super happy with this update.