Date: Mon, 14 Nov 2016 07:51:32 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426091 - in head/multimedia/dvbcut: . files Message-ID: <201611140751.uAE7pWae061276@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Mon Nov 14 07:51:32 2016 New Revision: 426091 URL: https://svnweb.freebsd.org/changeset/ports/426091 Log: Update to version 0.7.0, which appears to be another fork of the no longer maintained version 0.5.4 (or the already forked 0.6.2). This version adds support for qt5 (port option, default remains at qt4) and is claimed to be compatible with ffmpeg-3.x (not verified, yet). PR: 214193 Reported by: jbeich (ffmpeg-3 exp-run) Added: head/multimedia/dvbcut/files/patch-dvbcut.cpp (contents, props changed) head/multimedia/dvbcut/files/patch-dvbcut.h (contents, props changed) head/multimedia/dvbcut/files/patch-main.cpp (contents, props changed) Deleted: head/multimedia/dvbcut/files/patch-lavfmuxer.cpp head/multimedia/dvbcut/files/patch-src.pro Modified: head/multimedia/dvbcut/Makefile head/multimedia/dvbcut/distinfo head/multimedia/dvbcut/files/patch-avframe.cpp head/multimedia/dvbcut/files/patch-defines.h head/multimedia/dvbcut/files/patch-index.h head/multimedia/dvbcut/pkg-plist Modified: head/multimedia/dvbcut/Makefile ============================================================================== --- head/multimedia/dvbcut/Makefile Mon Nov 14 07:48:32 2016 (r426090) +++ head/multimedia/dvbcut/Makefile Mon Nov 14 07:51:32 2016 (r426091) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dvbcut -PORTVERSION= 0.6.2.a1 -PORTREVISION= 4 +PORTVERSION= 0.7.0 CATEGORIES= multimedia MAINTAINER= se@FreeBSD.org @@ -20,21 +19,27 @@ LIB_DEPENDS= liba52.so:audio/liba52 \ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes -GH_ACCOUNT= nextghost -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 +GH_ACCOUNT= bernhardu +GH_PROJECT= dvbcut-deb +GH_TAGNAME= 381549c + +USES= qmake:outsource pkgconfig desktop-file-utils shared-mime-info CXXFLAGS+= -I${LOCALBASE}/include \ -I${LOCALBASE}/include/libavcodec \ -I${LOCALBASE}/include/libavformat \ - -I${LOCALBASE}/include/libswscale + -I${LOCALBASE}/include/libswscale \ + -D DVBCUT_VERSION=$(PORTVERSION) + +QMAKE_SOURCE_PATH=${WRKSRC}/src +QMAKE_ARGS= LRELEASE="${LRELEASE}" + +OPTIONS_RADIO= QT +OPTIONS_RADIO_QT= QT4 QT5 +OPTIONS_DEFAULT= QT4 -post-configure: - @${REINPLACE_CMD} -e '/CXX.*moc_progress/s/ -o / -O0 -o /' ${WRKSRC}/src/Makefile +QT4_USE= QT4=corelib,gui,xml,qt3support,linguisttools_build,moc_build,rcc_build,uic_build +QT5_USE= QT5=core,gui,widgets,xml,buildtools_build,linguisttools_build GL=gl post-build: @${SED} -e 's;@prefix@;${PREFIX};' \ @@ -42,7 +47,7 @@ post-build: > ${WRKSRC}/dvbcut.desktop do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKDIR}/.build/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/ Modified: head/multimedia/dvbcut/distinfo ============================================================================== --- head/multimedia/dvbcut/distinfo Mon Nov 14 07:48:32 2016 (r426090) +++ head/multimedia/dvbcut/distinfo Mon Nov 14 07:51:32 2016 (r426091) @@ -1,2 +1,3 @@ -SHA256 (nextghost-dvbcut-qt4-0.6.2.a1-81c31ed_GH0.tar.gz) = 4bc54dfa29bdb1aa54cf0969da60d0372fbdd5f7a5e63a2620fc81596ce4dcf5 -SIZE (nextghost-dvbcut-qt4-0.6.2.a1-81c31ed_GH0.tar.gz) = 1122176 +TIMESTAMP = 1478854634 +SHA256 (bernhardu-dvbcut-deb-0.7.0-381549c_GH0.tar.gz) = 176104ec3edb438161e96b21f04057670c23611f938baac510b6e4fc4a976298 +SIZE (bernhardu-dvbcut-deb-0.7.0-381549c_GH0.tar.gz) = 183544 Modified: head/multimedia/dvbcut/files/patch-avframe.cpp ============================================================================== --- head/multimedia/dvbcut/files/patch-avframe.cpp Mon Nov 14 07:48:32 2016 (r426090) +++ head/multimedia/dvbcut/files/patch-avframe.cpp Mon Nov 14 07:51:32 2016 (r426091) @@ -1,10 +1,11 @@ ---- src/avframe.cpp.orig 2013-06-16 09:57:51 UTC +--- src/avframe.cpp.orig 2016-06-23 12:34:35 UTC +++ src/avframe.cpp -@@ -22,6 +22,7 @@ - #include <QImage> - #include <cstdlib> - #include <cstdio> -+#include <types.h> - #include "avframe.h" +@@ -52,7 +52,7 @@ avframe::avframe(AVFrame *src, AVCodecCo + tobefreed = (uint8_t *)malloc(avpicture_get_size(ctx->pix_fmt, ctx->width, ctx->height)); - #ifdef HAVE_LIB_SWSCALE + avpicture_fill((AVPicture *)f, +- (u_int8_t*)tobefreed, ++ (uint8_t*)tobefreed, + ctx->pix_fmt,ctx->width,ctx->height); + + av_picture_copy((AVPicture *)f, (const AVPicture *) src, Modified: head/multimedia/dvbcut/files/patch-defines.h ============================================================================== --- head/multimedia/dvbcut/files/patch-defines.h Mon Nov 14 07:48:32 2016 (r426090) +++ head/multimedia/dvbcut/files/patch-defines.h Mon Nov 14 07:51:32 2016 (r426091) @@ -1,4 +1,4 @@ ---- src/defines.h.orig 2013-06-16 09:57:51 UTC +--- src/defines.h.orig 2016-06-23 12:34:35 UTC +++ src/defines.h @@ -42,6 +42,11 @@ static inline int videostream(int s=0) #endif Added: head/multimedia/dvbcut/files/patch-dvbcut.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvbcut/files/patch-dvbcut.cpp Mon Nov 14 07:51:32 2016 (r426091) @@ -0,0 +1,11 @@ +--- src/dvbcut.cpp.orig 2016-06-23 12:34:35 UTC ++++ src/dvbcut.cpp +@@ -1232,7 +1232,7 @@ void dvbcut::playPlay() + arguments << "-geometry" << QString().sprintf("%dx%d+0+0",int(ui->imagedisplay->width()),int(ui->imagedisplay->height())); + + if (currentaudiotrack>=0 && currentaudiotrack<mpg->getaudiostreams()) { +- arguments << "-aid" << QString().sprintf("0x%x",int(currentaudiotrack)); ++ arguments << "-aid" << QString().sprintf("0x%x", int(mpg->mplayeraudioid(currentaudiotrack))); + } + + // for now, pass all filenames from the current one up to the last one Added: head/multimedia/dvbcut/files/patch-dvbcut.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvbcut/files/patch-dvbcut.h Mon Nov 14 07:51:32 2016 (r426091) @@ -0,0 +1,19 @@ +--- src/dvbcut.h.orig 2016-06-23 12:34:35 UTC ++++ src/dvbcut.h +@@ -22,11 +22,14 @@ + #define _DVBCUT_DVBCUT_H + + #if !defined(DVBCUT_VERSION) +-#define DVBCUT_VERSION "git" ++#define DVBCUT_VERSION git + #endif + ++#define STRINGIFY(x) STRINGIFY1(x) ++#define STRINGIFY1(x) #x ++ + #ifndef VERSION_STRING +-#define VERSION_STRING "dvbcut-" DVBCUT_VERSION ++#define VERSION_STRING "dvbcut-" STRINGIFY(DVBCUT_VERSION) + #endif + + #include <string> Modified: head/multimedia/dvbcut/files/patch-index.h ============================================================================== --- head/multimedia/dvbcut/files/patch-index.h Mon Nov 14 07:48:32 2016 (r426090) +++ head/multimedia/dvbcut/files/patch-index.h Mon Nov 14 07:51:32 2016 (r426091) @@ -1,10 +1,12 @@ ---- src/index.h.orig 2013-06-16 09:57:51 UTC +--- src/index.h.orig 2016-06-23 12:34:35 UTC +++ src/index.h -@@ -22,7 +22,6 @@ +@@ -22,7 +22,9 @@ #define _DVBCUT_INDEX_H #include <stdint.h> --#include <byteswap.h> ++#ifndef __FreeBSD__ + #include <byteswap.h> ++#endif #include <set> #include <vector> #include "types.h" Added: head/multimedia/dvbcut/files/patch-main.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvbcut/files/patch-main.cpp Mon Nov 14 07:51:32 2016 (r426091) @@ -0,0 +1,11 @@ +--- src/main.cpp.orig 2016-06-23 12:34:35 UTC ++++ src/main.cpp +@@ -52,7 +52,7 @@ static char *argv0; + void + usage_exit(int rv=1) { + fprintf(stderr, +- "Usage ("VERSION_STRING"):\n" ++ "Usage (" VERSION_STRING "):\n" + " %s -generateidx [-idx <idxfilename>] [<mpgfilename> ...]\n" + " %s -batch [ OPTIONS ] <prjfilename> | <mpgfilename> ...\n\n" + "OPTIONS: -cut 4:3|16:9|TS|TS2|<list>, -exp <expfilename>,\n" Modified: head/multimedia/dvbcut/pkg-plist ============================================================================== --- head/multimedia/dvbcut/pkg-plist Mon Nov 14 07:48:32 2016 (r426090) +++ head/multimedia/dvbcut/pkg-plist Mon Nov 14 07:51:32 2016 (r426091) @@ -1,6 +1,8 @@ +@comment %%QT_BINDIR%%/dvbcut bin/dvbcut share/applications/dvbcut.desktop share/mime/packages/dvbcut.xml +share/icons/dvbcut/icons.qrc share/icons/dvbcut/bookmark.png share/icons/dvbcut/chapter.svgz share/icons/dvbcut/dvbcut.svg
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611140751.uAE7pWae061276>