On Tue Jan 02, 2018 at 10:39:56PM +0100, Nils Reuße wrote:
> On 01/02/2018 04:00 PM, Rafael Sadowski wrote:
> > Please find below a simple update diff for cantata.
> >
> > Tested on amd64. Ok? Comments?
> >
> > Best regards,
> >
> > Rafael Sadowski
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/audio/cantata/Makefile,v
> > retrieving revision 1.10
> > diff -u -p -u -p -r1.10 Makefile
> > --- Makefile 21 Nov 2017 00:12:59 -0000 1.10
> > +++ Makefile 2 Jan 2018 14:57:49 -0000
> > @@ -2,8 +2,7 @@
> > COMMENT = Qt-based MPD client
> > -DISTNAME = cantata-2.0.1
> > -REVISION = 2
> > +DISTNAME = cantata-2.2.0
> > CATEGORIES = audio
> > @@ -14,6 +13,11 @@ GH_PROJECT= cantata
> > # GPLv2 only
> > PERMIT_PACKAGE_CDROM = Yes
> > +WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
> > +WANTLIB += Qt5Multimedia Qt5Network Qt5Sql Qt5Svg Qt5Widgets Qt5Xml
> > +WANTLIB += avcodec avformat avutil c cdda_interface cdda_paranoia
> > +WANTLIB += cddb m mpg123 mtp musicbrainz5 speexdsp tag z
> > +
> > MODULES = devel/cmake \
> > x11/qt5
> > @@ -28,12 +32,6 @@ LIB_DEPENDS += audio/mpg123 \
> > x11/qt5/qtsvg \
> > devel/libmtp \
> > graphics/ffmpeg
> > -
> > -WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
> > -WANTLIB += Qt5Network Qt5Sql Qt5Svg Qt5Widgets Qt5Xml avcodec
> > -WANTLIB += avformat avutil c cdda_interface cdda_paranoia cddb
> > -WANTLIB += iconv intl m mpg123 mtp musicbrainz5 pthread speexdsp tag z
> > -WANTLIB += ${COMPILER_LIBCXX}
> > CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX:Path=${PREFIX} \
> > -DENABLE_LIBVLC=OFF \
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/audio/cantata/distinfo,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 distinfo
> > --- distinfo 27 Mar 2017 14:41:23 -0000 1.2
> > +++ distinfo 2 Jan 2018 14:57:49 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (cantata-2.0.1.tar.gz) =
> > KU/JaUTdK7YFZSWkmunbGx2ht5AqxjKG7WwBYiuOO1I=
> > -SIZE (cantata-2.0.1.tar.gz) = 2711833
> > +SHA256 (cantata-2.2.0.tar.gz) =
> > KU/JaUTdK7YFZSWkmunbGx2ht5AqxjKG7WwBYiuOO1I=
> > +SIZE (cantata-2.2.0.tar.gz) = 2711833
> >
>
> Hi Rafael,
>
> I posted a diff for 2.2.0 in November, but it hasn't been committed so far:
>
> https://marc.info/?l=openbsd-ports&m=151006286215923&w=2
>
Unnecessary and stupid DISTNAME leads to confusion! Nils, nice catch and
good work! A a few additional tweaks and fixes:
1.) Remove stupid DISTNAME
2.) Reorder stuff
3.) Add audio/libcdio and remove speexdsp as LIB_DEPENDS
4.) Regen WANTLIB
New round for oks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/cantata/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile 21 Nov 2017 00:12:59 -0000 1.10
+++ Makefile 2 Jan 2018 22:28:05 -0000
@@ -2,25 +2,27 @@
COMMENT = Qt-based MPD client
-DISTNAME = cantata-2.0.1
-REVISION = 2
-
-CATEGORIES = audio
-
-GH_TAGNAME= v2.0.1
GH_ACCOUNT= CDrummond
GH_PROJECT= cantata
+GH_TAGNAME= v2.2.0
+
+CATEGORIES = audio
# GPLv2 only
PERMIT_PACKAGE_CDROM = Yes
+WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
+WANTLIB += Qt5Multimedia Qt5Network Qt5Sql Qt5Svg Qt5Widgets Qt5Xml
+WANTLIB += avcodec avformat avutil c cddb cdio cdio_cdda cdio_paranoia
+WANTLIB += m mpg123 mtp musicbrainz5 tag z
+
MODULES = devel/cmake \
x11/qt5
RUN_DEPENDS += devel/desktop-file-utils
RUN_DEPENDS += x11/gtk+3,-guic
LIB_DEPENDS += audio/mpg123 \
- audio/speexdsp \
+ audio/libcdio \
audio/libcddb \
audio/libmusicbrainz5 \
audio/taglib \
@@ -28,12 +30,6 @@ LIB_DEPENDS += audio/mpg123 \
x11/qt5/qtsvg \
devel/libmtp \
graphics/ffmpeg
-
-WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
-WANTLIB += Qt5Network Qt5Sql Qt5Svg Qt5Widgets Qt5Xml avcodec
-WANTLIB += avformat avutil c cdda_interface cdda_paranoia cddb
-WANTLIB += iconv intl m mpg123 mtp musicbrainz5 pthread speexdsp tag z
-WANTLIB += ${COMPILER_LIBCXX}
CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX:Path=${PREFIX} \
-DENABLE_LIBVLC=OFF \
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/cantata/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 27 Mar 2017 14:41:23 -0000 1.2
+++ distinfo 2 Jan 2018 22:28:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (cantata-2.0.1.tar.gz) = KU/JaUTdK7YFZSWkmunbGx2ht5AqxjKG7WwBYiuOO1I=
-SIZE (cantata-2.0.1.tar.gz) = 2711833
+SHA256 (cantata-2.2.0.tar.gz) = AA96hWFmf8jRX607i/CtqPaTp2/tCvr6FmoCJcyT6d4=
+SIZE (cantata-2.2.0.tar.gz) = 2955660
Index: patches/patch-devices_extractjob_h
===================================================================
RCS file: patches/patch-devices_extractjob_h
diff -N patches/patch-devices_extractjob_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-devices_extractjob_h 2 Jan 2018 22:28:05 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+If libcdios header is found before cdparanioas, CD_FRAMESIZE_RAW is not defined
+because our libcdio is too old (this define got added in 0.82):
+
+http://git.savannah.gnu.org/cgit/libcdio.git/tree/include/cdio/sector.h?h=release-0.82#n274
+
+Index: devices/extractjob.h
+--- devices/extractjob.h.orig
++++ devices/extractjob.h
+@@ -27,6 +27,9 @@
+
+ #include "filejob.h"
+ #include "encoders.h"
++#ifndef CD_FRAMESIZE_RAW
++#define CD_FRAMESIZE_RAW CDIO_CD_FRAMESIZE_RAW
++#endif
+
+ class ExtractJob : public FileJob
+ {
Index: patches/patch-devices_musicbrainz_cpp
===================================================================
RCS file: patches/patch-devices_musicbrainz_cpp
diff -N patches/patch-devices_musicbrainz_cpp
--- patches/patch-devices_musicbrainz_cpp 24 Jul 2017 00:41:14 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-devices_musicbrainz_cpp,v 1.1 2017/07/24 00:41:14 espie Exp $
-
-Index: devices/musicbrainz.cpp
---- devices/musicbrainz.cpp.orig
-+++ devices/musicbrainz.cpp
-@@ -248,7 +248,7 @@ void MusicBrainz::lookup(bool full)
- }
- DBUG << "Should lookup " << discId;
-
-- MusicBrainz5::CQuery Query("cantata-"PACKAGE_VERSION_STRING);
-+ MusicBrainz5::CQuery Query("cantata-" PACKAGE_VERSION_STRING);
- QList<CdAlbum> m;
- QList<QNetworkProxy>
proxies=NetworkProxyFactory::self()->queryProxy(QNetworkProxyQuery(QUrl("http://musicbrainz.org";)));
- foreach (const QNetworkProxy &p, proxies) {
Index: patches/patch-support_utils_cpp
===================================================================
RCS file: patches/patch-support_utils_cpp
diff -N patches/patch-support_utils_cpp
--- patches/patch-support_utils_cpp 24 Jul 2017 00:08:25 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-support_utils_cpp,v 1.1 2017/07/24 00:08:25 espie Exp $
-
-Index: support/utils.cpp
---- support/utils.cpp.orig
-+++ support/utils.cpp
-@@ -773,7 +773,7 @@ QString Utils::helper(const QString &app)
- #elif defined Q_OS_MAC
- return fixPath(QCoreApplication::applicationDirPath())+app;
- #else
-- return QString(INSTALL_PREFIX
"/"LINUX_LIB_DIR"/")+QCoreApplication::applicationName()+constDirSep+app;
-+ return QString(INSTALL_PREFIX "/" LINUX_LIB_DIR
"/")+QCoreApplication::applicationName()+constDirSep+app;
- #endif
- }
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/cantata/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 27 Mar 2017 14:41:23 -0000 1.2
+++ pkg/PLIST 2 Jan 2018 22:28:05 -0000
@@ -12,7 +12,7 @@ share/cantata/config/scrobblers.xml
share/cantata/config/tag_fixes.xml
share/cantata/config/weblinks.xml
share/cantata/fonts/
-share/cantata/fonts/fontawesome-4.3.0.ttf
+share/cantata/fonts/fontawesome-webfont.ttf
share/cantata/icons/
share/cantata/icons/bbc.svg
share/cantata/icons/cantata/
@@ -23,7 +23,6 @@ share/cantata/icons/cantata/svg/
share/cantata/icons/cantata/svg/audio-x-generic.svg
share/cantata/icons/cantata/svg/cantata.svg
share/cantata/icons/cantata/svg/drive-removable-media-usb-pendrive.svg
-share/cantata/icons/cantata/svg/dynamic-playlist.svg
share/cantata/icons/cantata/svg/folder-downloads.svg
share/cantata/icons/cantata/svg/folder-temp.svg
share/cantata/icons/cantata/svg/fork.svg
@@ -31,7 +30,6 @@ share/cantata/icons/cantata/svg/informat
share/cantata/icons/cantata/svg/inode-directory.svg
share/cantata/icons/cantata/svg/multimedia-player.svg
share/cantata/icons/cantata/svg/network-server-database.svg
-share/cantata/icons/cantata/svg/playlist.svg
share/cantata/icons/cantata/svg/preferences-desktop-keyboard.svg
share/cantata/icons/cantata/svg/preferences-other.svg
share/cantata/icons/cantata/svg/speaker.svg
@@ -50,32 +48,30 @@ share/cantata/mpd/mpd.conf.template
share/cantata/scripts/
share/cantata/scripts/cantata-dynamic
share/cantata/scripts/cantata-remote
-share/cantata/themes/
-share/cantata/themes/adwaita.css
-share/cantata/themes/ambiance-dt.css
-share/cantata/themes/ambiance.css
-share/cantata/themes/elementary.css
-share/cantata/themes/faience.css
-share/cantata/themes/mint-x.css
-share/cantata/themes/radiance-dt.css
-share/cantata/themes/radiance.css
share/cantata/translations/
+share/cantata/translations/blank.qm
share/cantata/translations/cantata_cs.qm
share/cantata/translations/cantata_de.qm
share/cantata/translations/cantata_en_GB.qm
share/cantata/translations/cantata_es.qm
share/cantata/translations/cantata_fr.qm
share/cantata/translations/cantata_hu.qm
+share/cantata/translations/cantata_it.qm
+share/cantata/translations/cantata_ja.qm
share/cantata/translations/cantata_ko.qm
share/cantata/translations/cantata_pl.qm
share/cantata/translations/cantata_ru.qm
share/cantata/translations/cantata_zh_CN.qm
+share/icons/hicolor/128x128/apps/cantata.png
share/icons/hicolor/16x16/apps/cantata.png
share/icons/hicolor/22x22/apps/cantata.png
share/icons/hicolor/24x24/apps/cantata.png
+share/icons/hicolor/256x256/apps/cantata.png
share/icons/hicolor/32x32/apps/cantata.png
share/icons/hicolor/48x48/apps/cantata.png
+share/icons/hicolor/512x512/apps/cantata.png
share/icons/hicolor/64x64/apps/cantata.png
+share/icons/hicolor/scalable/apps/cantata-symbolic.svg
share/icons/hicolor/scalable/apps/cantata.svg
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
