1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Update to the port's dependencies and minor changes to the port's patches.

No functional changes.

Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>
Approved by:	antoine
This commit is contained in:
Stefan Eßer 2015-08-03 20:11:06 +00:00
parent e8af6a22a2
commit 11058363ec
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=393493
6 changed files with 37 additions and 32 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= dvbcut
PORTVERSION= 0.6.2.a1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= multimedia
MAINTAINER= se@FreeBSD.org
@ -12,8 +12,7 @@ COMMENT= Qt application for cutting of MPEG PS and MPEG TS streams (DVB)
LICENSE= GPLv2
BUILD_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \
ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
pkg-config:${PORTSDIR}/devel/pkgconf
ffmpeg:${PORTSDIR}/multimedia/ffmpeg
LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 \
libao.so:${PORTSDIR}/audio/libao \
libmad.so:${PORTSDIR}/audio/libmad \
@ -25,9 +24,9 @@ GH_ACCOUNT= nextghost
GH_PROJECT= dvbcut-qt4
GH_TAGNAME= 81c31ed
USES= qmake desktop-file-utils shared-mime-info
USE_QT4= gui linguist moc_build rcc_build uic_build
INSTALLS_ICONS= yes
USES= desktop-file-utils pkgconfig qmake shared-mime-info
USE_QT4= corelib gui xml linguisttools_build moc_build rcc_build \
uic_build
CXXFLAGS+= -I${LOCALBASE}/include \
-I${LOCALBASE}/include/libavcodec \
@ -35,22 +34,22 @@ CXXFLAGS+= -I${LOCALBASE}/include \
-I${LOCALBASE}/include/libswscale
post-configure:
${REINPLACE_CMD} -e '/CXX.*moc_progress/s/ -o / -O0 -o /' ${WRKSRC}/src/Makefile
@${REINPLACE_CMD} -e '/CXX.*moc_progress/s/ -o / -O0 -o /' ${WRKSRC}/src/Makefile
post-build:
${SED} -e 's;@prefix@;${PREFIX};' \
@${SED} -e 's;@prefix@;${PREFIX};' \
< ${WRKSRC}/dvbcut.desktop.in \
> ${WRKSRC}/dvbcut.desktop
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${STAGEDIR}${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${STAGEDIR}${MANPREFIX}/man/man1/
${MKDIR} $(STAGEDIR)$(PREFIX)/share/applications
$(INSTALL_DATA) ${WRKSRC}/dvbcut.desktop $(STAGEDIR)$(PREFIX)/share/applications/
${MKDIR} $(STAGEDIR)$(PREFIX)/share/icons/dvbcut
$(INSTALL_DATA) ${WRKSRC}/dvbcut.svg $(STAGEDIR)$(PREFIX)/share/icons/dvbcut/
$(INSTALL_DATA) ${WRKSRC}/icons/* $(STAGEDIR)$(PREFIX)/share/icons/dvbcut/
${MKDIR} $(STAGEDIR)$(PREFIX)/share/mime/packages
$(INSTALL_DATA) ${WRKSRC}/dvbcut.xml $(STAGEDIR)$(PREFIX)/share/mime/packages/
${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/dvbcut.desktop ${STAGEDIR}${PREFIX}/share/applications/
${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/dvbcut
${INSTALL_DATA} ${WRKSRC}/dvbcut.svg ${STAGEDIR}${PREFIX}/share/icons/dvbcut/
${INSTALL_DATA} ${WRKSRC}/icons/* ${STAGEDIR}${PREFIX}/share/icons/dvbcut/
${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
${INSTALL_DATA} ${WRKSRC}/dvbcut.xml ${STAGEDIR}${PREFIX}/share/mime/packages/
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
--- src/avframe.cpp~ 2013-06-16 11:57:51.000000000 +0200
+++ src/avframe.cpp 2013-11-29 22:27:30.884805249 +0100
--- src/avframe.cpp.orig 2013-06-16 09:57:51 UTC
+++ src/avframe.cpp
@@ -22,6 +22,7 @@
#include <QImage>
#include <cstdlib>

View File

@ -1,6 +1,6 @@
--- src/defines.h~ 2013-06-16 11:57:51.000000000 +0200
+++ src/defines.h 2013-11-29 22:35:26.867434652 +0100
@@ -42,6 +42,11 @@
--- src/defines.h.orig 2013-06-16 09:57:51 UTC
+++ src/defines.h
@@ -42,6 +42,11 @@ static inline int videostream(int s=0)
#endif
}

View File

@ -1,12 +1,10 @@
--- src/index.h~ 2013-06-16 11:57:51.000000000 +0200
+++ src/index.h 2013-11-29 22:22:16.383291556 +0100
@@ -22,7 +22,7 @@
--- src/index.h.orig 2013-06-16 09:57:51 UTC
+++ src/index.h
@@ -22,7 +22,6 @@
#define _DVBCUT_INDEX_H
#include <stdint.h>
-#include <byteswap.h>
+//#include <endian.h>
#include <set>
#include <vector>
#include "types.h"

View File

@ -1,6 +1,6 @@
--- src/lavfmuxer.cpp~ 2013-06-16 11:57:51.000000000 +0200
+++ src/lavfmuxer.cpp 2013-11-29 22:24:36.075415060 +0100
@@ -40,6 +40,10 @@
--- src/lavfmuxer.cpp.orig 2013-06-16 09:57:51 UTC
+++ src/lavfmuxer.cpp
@@ -40,6 +40,10 @@ extern "C" {
#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
#endif

View File

@ -1,6 +1,15 @@
--- src/src.pro.orig 2013-06-16 11:57:51.000000000 +0200
+++ src/src.pro 2013-12-01 14:55:10.313369943 +0100
@@ -70,8 +70,8 @@
--- src/src.pro.orig 2013-06-16 09:57:51 UTC
+++ src/src.pro
@@ -12,6 +12,8 @@ QT += xml
system(pkg-config --exists libavcodec) {
message(Building with external FFMPEG)
PKGCONFIG += libavformat libavcodec libavutil
+ QMAKE_CXXFLAGS += -DHAVE_LIB_A52
+ LIBS += -la52
system(pkg-config --exists libswscale) {
message(Building with libswscale support)
@@ -70,7 +72,7 @@ verinfo.commands = ../setversion.sh $$SO
QMAKE_EXTRA_TARGETS += verinfo
@ -9,4 +18,3 @@
l10n.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
l10n.input = TRANSLATIONS
l10n.output = ${QMAKE_FILE_BASE}.qm