Attachment #158934 for bug #201672

View | Details | Raw Unified | Return to bug 201672
Collapse All | Expand All





PORTNAME=	dvbcut
PORTVERSION=	0.6.2.a1
PORTREVISION=	4
CATEGORIES=	multimedia

MAINTAINER=	se@FreeBSD.org

LICENSE=	GPLv2

BUILD_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
		ffmpeg:${PORTSDIR}/multimedia/ffmpeg
		pkg-config:${PORTSDIR}/devel/pkgconf
LIB_DEPENDS=	liba52.so:${PORTSDIR}/audio/liba52 \
		libao.so:${PORTSDIR}/audio/libao \
		libmad.so:${PORTSDIR}/audio/libmad \

GH_PROJECT=	dvbcut-qt4
GH_TAGNAME=	81c31ed

USES=		desktop-file-utils pkgconfig qmake shared-mime-info
USE_QT4=	corelib gui xml linguisttools_build moc_build rcc_build \
		uic_build
INSTALLS_ICONS=	yes

CXXFLAGS+=	-I${LOCALBASE}/include \

		-I${LOCALBASE}/include/libswscale

post-configure:
		@${REINPLACE_CMD} -e '/CXX.*moc_progress/s/ -o / -O0 -o /' ${WRKSRC}/src/Makefile

post-build:
		@${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/

.include <bsd.port.mk>

Lines 1-10 Link Here

(-)multimedia/dvbcut/files/patch-avframe.cpp (-10 lines)
1	--- src/avframe.cpp~ 2013-06-16 11:57:51.000000000 +0200
2	+++ src/avframe.cpp 2013-11-29 22:27:30.884805249 +0100
3	@@ -22,6 +22,7 @@
4	#include <QImage>
5	#include <cstdlib>
6	#include <cstdio>
7	+#include <types.h>
8	#include "avframe.h"
9
10	#ifdef HAVE_LIB_SWSCALE

Lines 1-14 Link Here

(-)multimedia/dvbcut/files/patch-defines.h (-14 lines)
1	--- src/defines.h~ 2013-06-16 11:57:51.000000000 +0200
2	+++ src/defines.h 2013-11-29 22:35:26.867434652 +0100
3	@@ -42,6 +42,11 @@
4	#endif
5	}
6
7	+#ifdef __FreeBSD__
8	+#define __bswap_32(x) __bswap32(x)
9	+#define __bswap_16(x) __bswap16(x)
10	+#endif
11	+
12	#if __BYTE_ORDER == __LITTLE_ENDIAN
13	#define mbo32(x) \
14	((((x) & 0xff000000) >> 24) \| (((x) & 0x00ff0000) >> 8) \| \

Lines 1-12 Link Here

(-)multimedia/dvbcut/files/patch-index.h (-12 lines)
1	--- src/index.h~ 2013-06-16 11:57:51.000000000 +0200
2	+++ src/index.h 2013-11-29 22:22:16.383291556 +0100
3	@@ -22,7 +22,7 @@
4	#define _DVBCUT_INDEX_H
5
6	#include <stdint.h>
7	-#include <byteswap.h>
8	+//#include <endian.h>
9	#include <set>
10	#include <vector>
11	#include "types.h"
12




--- 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 @@
 	#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
 #endif
 
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
 lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg, const char *filename)
     : muxer(), avfc(0), fileopened(false)
   {




--- 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 @@
 
 QMAKE_EXTRA_TARGETS += verinfo
 
-qtPrepareTool(LRELEASE, lrelease)
+qtPrepareTool(LRELEASE, lrelease-qt4)
 
 l10n.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
 l10n.input = TRANSLATIONS
 l10n.output = ${QMAKE_FILE_BASE}.qm

Line 0 Link Here

(-)multimedia/dvbcut/files/patch-src_avframe.cpp (+10 lines)
	1	--- src/avframe.cpp.orig 2013-06-16 09:57:51 UTC
	2	+++ src/avframe.cpp
	3	@@ -22,6 +22,7 @@
	4	#include <QImage>
	5	#include <cstdlib>
	6	#include <cstdio>
	7	+#include <types.h>
	8	#include "avframe.h"
	9
	10	#ifdef HAVE_LIB_SWSCALE




--- 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
   }
 
+#ifdef __FreeBSD__
+#define __bswap_32(x) __bswap32(x)
+#define __bswap_16(x) __bswap16(x)
+#endif
+
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define mbo32(x) \
       ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \

Line 0 Link Here

(-)multimedia/dvbcut/files/patch-src_index.h (+10 lines)
	1	--- src/index.h.orig 2013-06-16 09:57:51 UTC
	2	+++ src/index.h
	3	@@ -22,7 +22,6 @@
	4	#define _DVBCUT_INDEX_H
	5
	6	#include <stdint.h>
	7	-#include <byteswap.h>
	8	#include <set>
	9	#include <vector>
	10	#include "types.h"




--- 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
 
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
+
 lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg, const char *filename)
     : muxer(), avfc(0), fileopened(false)
   {




--- 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
 
-qtPrepareTool(LRELEASE, lrelease)
+qtPrepareTool(LRELEASE, lrelease-qt4)
 
 l10n.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
 l10n.input = TRANSLATIONS

Return to bug 201672

Lines 3-9 Link Here

(-)multimedia/dvbcut/Makefile (-14 / +14 lines)
3		3
4	PORTNAME= dvbcut	4	PORTNAME= dvbcut
5	PORTVERSION= 0.6.2.a1	5	PORTVERSION= 0.6.2.a1
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8		8
9	MAINTAINER= se@FreeBSD.org	9	MAINTAINER= se@FreeBSD.org
Lines 12-19 Link Here
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
14	BUILD_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \	14	BUILD_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \
15	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \	15	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
16	pkg-config:${PORTSDIR}/devel/pkgconf
17	LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 \	16	LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 \
18	libao.so:${PORTSDIR}/audio/libao \	17	libao.so:${PORTSDIR}/audio/libao \
19	libmad.so:${PORTSDIR}/audio/libmad \	18	libmad.so:${PORTSDIR}/audio/libmad \
Lines 25-32 Link Here
25	GH_PROJECT= dvbcut-qt4	24	GH_PROJECT= dvbcut-qt4
26	GH_TAGNAME= 81c31ed	25	GH_TAGNAME= 81c31ed
27		26
28	USES= qmake desktop-file-utils shared-mime-info	27	USES= desktop-file-utils pkgconfig qmake shared-mime-info
29	USE_QT4= gui linguist moc_build rcc_build uic_build	28	USE_QT4= corelib gui xml linguisttools_build moc_build rcc_build \
		29	uic_build
30	INSTALLS_ICONS= yes	30	INSTALLS_ICONS= yes
31		31
32	CXXFLAGS+= -I${LOCALBASE}/include \	32	CXXFLAGS+= -I${LOCALBASE}/include \
Lines 35-44 Link Here
35	-I${LOCALBASE}/include/libswscale	35	-I${LOCALBASE}/include/libswscale
36		36
37	post-configure:	37	post-configure:
38	${REINPLACE_CMD} -e '/CXX.*moc_progress/s/ -o / -O0 -o /' ${WRKSRC}/src/Makefile	38	@${REINPLACE_CMD} -e '/CXX.*moc_progress/s/ -o / -O0 -o /' ${WRKSRC}/src/Makefile
39		39
40	post-build:	40	post-build:
41	${SED} -e 's;@prefix@;${PREFIX};' \	41	@${SED} -e 's;@prefix@;${PREFIX};' \
42	< ${WRKSRC}/dvbcut.desktop.in \	42	< ${WRKSRC}/dvbcut.desktop.in \
43	> ${WRKSRC}/dvbcut.desktop	43	> ${WRKSRC}/dvbcut.desktop
44		44
Lines 45-56 Link Here
45	do-install:	45	do-install:
46	${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${STAGEDIR}${PREFIX}/bin/	46	${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${STAGEDIR}${PREFIX}/bin/
47	${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${STAGEDIR}${MANPREFIX}/man/man1/	47	${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${STAGEDIR}${MANPREFIX}/man/man1/
48	${MKDIR} $(STAGEDIR)$(PREFIX)/share/applications	48	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
49	$(INSTALL_DATA) ${WRKSRC}/dvbcut.desktop $(STAGEDIR)$(PREFIX)/share/applications/	49	${INSTALL_DATA} ${WRKSRC}/dvbcut.desktop ${STAGEDIR}${PREFIX}/share/applications/
50	${MKDIR} $(STAGEDIR)$(PREFIX)/share/icons/dvbcut	50	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/dvbcut
51	$(INSTALL_DATA) ${WRKSRC}/dvbcut.svg $(STAGEDIR)$(PREFIX)/share/icons/dvbcut/	51	${INSTALL_DATA} ${WRKSRC}/dvbcut.svg ${STAGEDIR}${PREFIX}/share/icons/dvbcut/
52	$(INSTALL_DATA) ${WRKSRC}/icons/* $(STAGEDIR)$(PREFIX)/share/icons/dvbcut/	52	${INSTALL_DATA} ${WRKSRC}/icons/* ${STAGEDIR}${PREFIX}/share/icons/dvbcut/
53	${MKDIR} $(STAGEDIR)$(PREFIX)/share/mime/packages	53	${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
54	$(INSTALL_DATA) ${WRKSRC}/dvbcut.xml $(STAGEDIR)$(PREFIX)/share/mime/packages/	54	${INSTALL_DATA} ${WRKSRC}/dvbcut.xml ${STAGEDIR}${PREFIX}/share/mime/packages/
55		55
56	.include <bsd.port.mk>	56	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)multimedia/dvbcut/files/patch-lavfmuxer.cpp (-13 lines)
1	--- src/lavfmuxer.cpp~ 2013-06-16 11:57:51.000000000 +0200
2	+++ src/lavfmuxer.cpp 2013-11-29 22:24:36.075415060 +0100
3	@@ -40,6 +40,10 @@
4	#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
5	#endif
6
7	+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
8	+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
9	+#endif
10	+
11	lavfmuxer::lavfmuxer(const char format, uint32_t audiostreammask, mpgfile &mpg, const char filename)
12	: muxer(), avfc(0), fileopened(false)
13	{

Lines 1-12 Link Here

(-)multimedia/dvbcut/files/patch-src.pro (-12 lines)
1	--- src/src.pro.orig 2013-06-16 11:57:51.000000000 +0200
2	+++ src/src.pro 2013-12-01 14:55:10.313369943 +0100
3	@@ -70,8 +70,8 @@
4
5	QMAKE_EXTRA_TARGETS += verinfo
6
7	-qtPrepareTool(LRELEASE, lrelease)
8	+qtPrepareTool(LRELEASE, lrelease-qt4)
9
10	l10n.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
11	l10n.input = TRANSLATIONS
12	l10n.output = ${QMAKE_FILE_BASE}.qm

Line 0 Link Here

(-)multimedia/dvbcut/files/patch-src_defines.h (+14 lines)
	1	--- src/defines.h.orig 2013-06-16 09:57:51 UTC
	2	+++ src/defines.h
	3	@@ -42,6 +42,11 @@ static inline int videostream(int s=0)
	4	#endif
	5	}
	6
	7	+#ifdef __FreeBSD__
	8	+#define __bswap_32(x) __bswap32(x)
	9	+#define __bswap_16(x) __bswap16(x)
	10	+#endif
	11	+
	12	#if __BYTE_ORDER == __LITTLE_ENDIAN
	13	#define mbo32(x) \
	14	((((x) & 0xff000000) >> 24) \| (((x) & 0x00ff0000) >> 8) \| \

Line 0 Link Here

(-)multimedia/dvbcut/files/patch-src_lavfmuxer.cpp (+13 lines)
	1	--- src/lavfmuxer.cpp.orig 2013-06-16 09:57:51 UTC
	2	+++ src/lavfmuxer.cpp
	3	@@ -40,6 +40,10 @@ extern "C" {
	4	#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
	5	#endif
	6
	7	+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
	8	+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
	9	+#endif
	10	+
	11	lavfmuxer::lavfmuxer(const char format, uint32_t audiostreammask, mpgfile &mpg, const char filename)
	12	: muxer(), avfc(0), fileopened(false)
	13	{

Line 0 Link Here

(-)multimedia/dvbcut/files/patch-src_src.pro (+20 lines)
	1	--- src/src.pro.orig 2013-06-16 09:57:51 UTC
	2	+++ src/src.pro
	3	@@ -12,6 +12,8 @@ QT += xml
	4	system(pkg-config --exists libavcodec) {
	5	message(Building with external FFMPEG)
	6	PKGCONFIG += libavformat libavcodec libavutil
	7	+ QMAKE_CXXFLAGS += -DHAVE_LIB_A52
	8	+ LIBS += -la52
	9
	10	system(pkg-config --exists libswscale) {
	11	message(Building with libswscale support)
	12	@@ -70,7 +72,7 @@ verinfo.commands = ../setversion.sh $$SO
	13
	14	QMAKE_EXTRA_TARGETS += verinfo
	15
	16	-qtPrepareTool(LRELEASE, lrelease)
	17	+qtPrepareTool(LRELEASE, lrelease-qt4)
	18
	19	l10n.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
	20	l10n.input = TRANSLATIONS