Attachment 158934 Details for Bug 201672 – Patch.diff

[patch] Patch.diff

patch-dvbcut.diff (text/plain), 10.51 KB, created by Andriy Voskoboinyk on 2015-07-18 11:27:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-07-18 11:27:30 UTC

Size: 10.51 KB

patch

obsolete

>Index: multimedia/dvbcut/Makefile
>===================================================================
>--- multimedia/dvbcut/Makefile	(revision 392405)
>+++ multimedia/dvbcut/Makefile	(working copy)
>@@ -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 @@
> 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,8 +24,9 @@
> 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
>+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 \
>@@ -35,10 +35,10 @@
> 		-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
> 
>@@ -45,12 +45,12 @@
> 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>
>Index: multimedia/dvbcut/files/patch-avframe.cpp
>===================================================================
>--- multimedia/dvbcut/files/patch-avframe.cpp	(revision 392405)
>+++ multimedia/dvbcut/files/patch-avframe.cpp	(working copy)
>@@ -1,10 +0,0 @@
>---- src/avframe.cpp~	2013-06-16 11:57:51.000000000 +0200
>-+++ src/avframe.cpp	2013-11-29 22:27:30.884805249 +0100
>-@@ -22,6 +22,7 @@
>- #include <QImage>
>- #include <cstdlib>
>- #include <cstdio>
>-+#include <types.h>
>- #include "avframe.h"
>- 
>- #ifdef HAVE_LIB_SWSCALE
>Index: multimedia/dvbcut/files/patch-defines.h
>===================================================================
>--- multimedia/dvbcut/files/patch-defines.h	(revision 392405)
>+++ multimedia/dvbcut/files/patch-defines.h	(working copy)
>@@ -1,14 +0,0 @@
>---- 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 @@
>- #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) | \
>Index: multimedia/dvbcut/files/patch-index.h
>===================================================================
>--- multimedia/dvbcut/files/patch-index.h	(revision 392405)
>+++ multimedia/dvbcut/files/patch-index.h	(working copy)
>@@ -1,12 +0,0 @@
>---- 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 @@
>- #define _DVBCUT_INDEX_H
>- 
>- #include <stdint.h>
>--#include <byteswap.h>
>-+//#include <endian.h>
>- #include <set>
>- #include <vector>
>- #include "types.h"
>- 
>Index: multimedia/dvbcut/files/patch-lavfmuxer.cpp
>===================================================================
>--- multimedia/dvbcut/files/patch-lavfmuxer.cpp	(revision 392405)
>+++ multimedia/dvbcut/files/patch-lavfmuxer.cpp	(working copy)
>@@ -1,13 +0,0 @@
>---- 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)
>-   {
>Index: multimedia/dvbcut/files/patch-src.pro
>===================================================================
>--- multimedia/dvbcut/files/patch-src.pro	(revision 392405)
>+++ multimedia/dvbcut/files/patch-src.pro	(working copy)
>@@ -1,12 +0,0 @@
>---- 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
>Index: multimedia/dvbcut/files/patch-src_avframe.cpp
>===================================================================
>--- multimedia/dvbcut/files/patch-src_avframe.cpp	(revision 0)
>+++ multimedia/dvbcut/files/patch-src_avframe.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/avframe.cpp.orig	2013-06-16 09:57:51 UTC
>++++ src/avframe.cpp
>+@@ -22,6 +22,7 @@
>+ #include <QImage>
>+ #include <cstdlib>
>+ #include <cstdio>
>++#include <types.h>
>+ #include "avframe.h"
>+ 
>+ #ifdef HAVE_LIB_SWSCALE
>
>Property changes on: multimedia/dvbcut/files/patch-src_avframe.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: multimedia/dvbcut/files/patch-src_defines.h
>===================================================================
>--- multimedia/dvbcut/files/patch-src_defines.h	(revision 0)
>+++ multimedia/dvbcut/files/patch-src_defines.h	(working copy)
>@@ -0,0 +1,14 @@
>+--- 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) | \
>
>Property changes on: multimedia/dvbcut/files/patch-src_defines.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: multimedia/dvbcut/files/patch-src_index.h
>===================================================================
>--- multimedia/dvbcut/files/patch-src_index.h	(revision 0)
>+++ multimedia/dvbcut/files/patch-src_index.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- 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 <set>
>+ #include <vector>
>+ #include "types.h"
>
>Property changes on: multimedia/dvbcut/files/patch-src_index.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: multimedia/dvbcut/files/patch-src_lavfmuxer.cpp
>===================================================================
>--- multimedia/dvbcut/files/patch-src_lavfmuxer.cpp	(revision 0)
>+++ multimedia/dvbcut/files/patch-src_lavfmuxer.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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)
>+   {
>
>Property changes on: multimedia/dvbcut/files/patch-src_lavfmuxer.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: multimedia/dvbcut/files/patch-src_src.pro
>===================================================================
>--- multimedia/dvbcut/files/patch-src_src.pro	(revision 0)
>+++ multimedia/dvbcut/files/patch-src_src.pro	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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
>
>Property changes on: multimedia/dvbcut/files/patch-src_src.pro
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 201672: 158934 | 158935 | 158936