audio/mpz: the port had been updated to version 1.0.20

Now has better support building itself against system dependencies
(less patching required).

Reported by:	portscout
This commit is contained in:
Alexey Dokuchaev 2022-05-30 11:46:42 +00:00
parent 3ec5ed27aa
commit bcd33cb437
5 changed files with 13 additions and 60 deletions

View file

@ -1,7 +1,7 @@
# Created by: Alexey Dokuchaev <danfe@FreeBSD.org> # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
PORTNAME= mpz PORTNAME= mpz
PORTVERSION= 1.0.19 PORTVERSION= 1.0.20
CATEGORIES= audio CATEGORIES= audio
MAINTAINER= danfe@FreeBSD.org MAINTAINER= danfe@FreeBSD.org
@ -20,6 +20,8 @@ USE_GSTREAMER= flac libav mpg123 ogg opus vorbis
USE_QT= buildtools_build concurrent core dbus gui multimedia \ USE_QT= buildtools_build concurrent core dbus gui multimedia \
network widgets x11extras network widgets x11extras
QMAKE_ARGS= DEFINES+=USE_SYSTEM_TAGLIB DEFINES+=USE_SYSTEM_YAMLCPP
post-extract: post-extract:
@${RM} -r ${WRKSRC}/libs/taglib ${WRKSRC}/libs/yaml-cpp @${RM} -r ${WRKSRC}/libs/taglib ${WRKSRC}/libs/yaml-cpp

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1638963522 TIMESTAMP = 1653719700
SHA256 (olegantonyan-mpz-1.0.19_GH0.tar.gz) = 2496d849d953eaae911a7bfb10006d7e31118df33666fe01a9fbb6fae1a5f697 SHA256 (olegantonyan-mpz-1.0.20_GH0.tar.gz) = bd4d14e1cb2207745dd022f9633671a904ae3ef60a9f8ef3005939413213a86c
SIZE (olegantonyan-mpz-1.0.19_GH0.tar.gz) = 2700174 SIZE (olegantonyan-mpz-1.0.20_GH0.tar.gz) = 2702505

View file

@ -1,28 +1,11 @@
--- app/app.pro.orig 2021-12-08 11:38:42 UTC --- app/app.pro.orig 2022-05-28 06:35:00 UTC
+++ app/app.pro +++ app/app.pro
@@ -171,16 +171,12 @@ contains(DEFINES, MPRIS_ENABLE) { @@ -205,7 +205,7 @@ RESOURCES += \
# Libraries
INCLUDEPATH += \
- ../libs/taglib/taglib-1.12/taglib \
- ../libs/taglib/taglib-1.12/taglib/toolkit \
- ../libs/taglib/taglib-1.12/taglib/mpeg/id3v2 \
- ../libs/yaml-cpp/yaml-cpp-0.7.0/include \
+ ${LOCALBASE}/include/taglib \
../libs/qtwaitingspinner \
../libs/qhotkey/QHotkey-1.5.0
LIBS += \
- -L../libs/taglib -ltaglib \
- -L../libs/yaml-cpp -lyaml-cpp \
+ -L${LOCALBASE}/lib -ltag -lyaml-cpp \
-L../libs/qtwaitingspinner -lqtwaitingspinner \
-L../libs/qhotkey -lqhotkey
@@ -191,5 +187,5 @@ RESOURCES += \
../resources.qrc ../resources.qrc
# make install # make install
-target.path = /usr/bin/ -target.path = /usr/bin/
+target.path = $$PREFIX/bin/ +target.path = $$PREFIX/bin/
INSTALLS += target INSTALLS += target
TRANSLATIONS += \

View file

@ -1,25 +0,0 @@
--- app/coverart/embedded.cpp.orig 2021-12-08 11:38:42 UTC
+++ app/coverart/embedded.cpp
@@ -1,14 +1,14 @@
#include "coverart/embedded.h"
#include "tag.h"
-#include "mp4/mp4file.h"
-#include "mpeg/id3v2/id3v2.h"
-#include "mpeg/id3v2/id3v2frame.h"
-#include "mpeg/id3v2/frames/attachedpictureframe.h"
-#include "mpeg/id3v2/id3v2tag.h"
-#include "mpeg/mpegfile.h"
-#include "flac/flacfile.h"
-#include"flac/flacpicture.h"
+#include "mp4file.h"
+#include "id3v2.h"
+#include "id3v2frame.h"
+#include "attachedpictureframe.h"
+#include "id3v2tag.h"
+#include "mpegfile.h"
+#include "flacfile.h"
+#include "flacpicture.h"
#include "fileref.h"
#include "tag.h"
#include "tpropertymap.h"

View file

@ -1,14 +1,7 @@
--- mpz.pro.orig 2020-10-22 11:15:32 UTC --- mpz.pro.orig 2022-05-28 06:35:00 UTC
+++ mpz.pro +++ mpz.pro
@@ -2,39 +2,37 @@ TEMPLATE = subdirs @@ -13,32 +13,32 @@ SUBDIRS += app
CONFIG += ordered SUBDIRS += app
SUBDIRS = \
- libs/taglib \
- libs/yaml-cpp \
libs/qtwaitingspinner \
libs/qhotkey \
app
# make install # make install
-desktop.path = /usr/share/applications/ -desktop.path = /usr/share/applications/