Date: Fri, 3 Apr 2009 03:00:42 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/133320: Update port: multimedia/dvbcut to 0.6.0 Message-ID: <20090403030042.f907dfd5.tkato432@yahoo.com> Resent-Message-ID: <200904021810.n32IA5MU094535@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133320
>Category: ports
>Synopsis: Update port: multimedia/dvbcut to 0.6.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 02 18:10:05 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.1-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Update to version 0.6.0
files/patch-Makefile
files/patch-SConstruct
files/patch-avframe.h
files/patch-lavfmuxer.cpp
files/patch-main.cpp
files/patch-mpgfile.h
files/patch-playaudio.cpp
files/patch-psfile.cpp
files/patch-streamdata.h
files/patch-tsfile.cpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/multimedia/dvbcut/Makefile multimedia/dvbcut/Makefile
--- /usr/ports/multimedia/dvbcut/Makefile 2008-12-18 15:23:52.000000000 +0900
+++ multimedia/dvbcut/Makefile 2009-04-02 21:33:33.000000000 +0900
@@ -6,38 +6,34 @@
#
PORTNAME= dvbcut
-PORTVERSION= 0.5.4
-PORTREVISION= 2
+PORTVERSION= 0.6.0
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=dvbcut
-DISTNAME= ${PORTNAME}_${PORTVERSION}
+MASTER_SITES= http://www.mr511.de/dvbcut/
MAINTAINER= ports@FreeBSD.org
COMMENT= Qt application for cutting of MPEG PS and MPEG TS streams (DVB)
-BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons \
- mplayer:${PORTSDIR}/multimedia/mplayer
-RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
-LIB_DEPENDS= avutil.1:${PORTSDIR}/multimedia/ffmpeg \
- ao.3:${PORTSDIR}/audio/libao
+BUILD_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer
+LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \
+ ao.3:${PORTSDIR}/audio/libao \
+ mad.2:${PORTSDIR}/audio/libmad \
+ avutil.1:${PORTSDIR}/multimedia/ffmpeg
+RUN_DEPENDS:= ${BUILD_DEPENDS}
-BROKEN= does not compile
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_BZIP2= yes
-USE_GMAKE= yes
USE_QT_VER= 3
-ALL_TARGET= build
-MAKE_ENV= QTDIR=${QT_PREFIX} FFMPEG=${PREFIX} LDFLAGS="${LDFLAGS}"
-CFLAGS+= "'-pthread -D__STDC_CONSTANT_MACROS'"
-LDFLAGS+= -pthread
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-ffmpeg=${LOCALBASE}
+MAKEFILE= makefile
MAN1= dvbcut.1
PLIST_FILES= bin/dvbcut
+QTCPPFLAGS+= ${PTHREAD_CFLAGS}
+QTCFGLIBS+= ${PTHREAD_LIBS}
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${PREFIX}/man/man1/
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/dvbcut ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/dvbcut.1 ${MANPREFIX}/man/man1
.include <bsd.port.mk>
diff -urN /usr/ports/multimedia/dvbcut/distinfo multimedia/dvbcut/distinfo
--- /usr/ports/multimedia/dvbcut/distinfo 2007-04-30 18:43:09.000000000 +0900
+++ multimedia/dvbcut/distinfo 2009-03-26 18:12:46.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (dvbcut_0.5.4.tar.bz2) = 02803e28a6bf6850f129ca6aa0a9c96e
-SHA256 (dvbcut_0.5.4.tar.bz2) = db6500fc327585be6ee5a36135c9940828d22bde936daa17b6a5cce852ad9f70
-SIZE (dvbcut_0.5.4.tar.bz2) = 795991
+MD5 (dvbcut-0.6.0.tar.gz) = 81c8341a5340b7596aeaa1fd42254550
+SHA256 (dvbcut-0.6.0.tar.gz) = 41f15fe8112f1c52d2c598718422d03138fb3c18a83c44591ea560f065129b6d
+SIZE (dvbcut-0.6.0.tar.gz) = 1056571
diff -urN /usr/ports/multimedia/dvbcut/files/patch-Makefile multimedia/dvbcut/files/patch-Makefile
--- /usr/ports/multimedia/dvbcut/files/patch-Makefile 2005-12-29 09:18:05.000000000 +0900
+++ multimedia/dvbcut/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
---- Makefile~ Tue Dec 6 08:57:49 2005
-+++ Makefile Thu Dec 29 00:19:02 2005
-@@ -2,7 +2,9 @@
-
- build:
- scons $(if $(FFMPEG),FFMPEG=$(FFMPEG)) \
-- $(if $(DEBUG),DEBUG=$(DEBUG))
-+ $(if $(DEBUG),DEBUG=$(DEBUG)) \
-+ $(if $(CFLAGS),CFLAGS="$(CFLAGS)") \
-+ $(if $(LDFLAGS),LDFLAGS="$(LDFLAGS)")
-
- clean:
- scons --clean
diff -urN /usr/ports/multimedia/dvbcut/files/patch-SConstruct multimedia/dvbcut/files/patch-SConstruct
--- /usr/ports/multimedia/dvbcut/files/patch-SConstruct 2007-05-02 02:18:56.000000000 +0900
+++ multimedia/dvbcut/files/patch-SConstruct 1970-01-01 09:00:00.000000000 +0900
@@ -1,22 +0,0 @@
---- SConstruct~ Sun Dec 11 12:07:09 2005
-+++ SConstruct Thu Dec 29 00:19:48 2005
-@@ -38,13 +38,17 @@
-
- ###### BUILD ENVIRONMENT
-
-+opts.Add('CFLAGS','compiler flags', "-O3 -Wall")
-+opts.Add('LDFLAGS','linker flags', "")
-+
- env=Environment(options=opts, ENV=os.environ)
- debug=int(env['DEBUG'])
-
- if (debug>0):
- env.Append(CCFLAGS=['-g3','-Wall'])
--else:
-- env.Append(CCFLAGS=['-O3','-Wall'])
-+env.Append(CCFLAGS=Split(env["CFLAGS"]))
-+
-+env.Append(LINKFLAGS=Split(env["LDFLAGS"]))
-
- env.Replace(CXXFILESUFFIX=".cpp")
-
diff -urN /usr/ports/multimedia/dvbcut/files/patch-avframe.h multimedia/dvbcut/files/patch-avframe.h
--- /usr/ports/multimedia/dvbcut/files/patch-avframe.h 2007-07-17 15:27:12.000000000 +0900
+++ multimedia/dvbcut/files/patch-avframe.h 1970-01-01 09:00:00.000000000 +0900
@@ -1,12 +0,0 @@
---- src/avframe.h~ 2007-04-13 19:36:27 +0200
-+++ src/avframe.h 2007-07-17 01:08:23 +0200
-@@ -19,7 +19,9 @@
- #ifndef _DVBCUT_AVFRAME_H
- #define _DVBCUT_AVFRAME_H
-
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-
- class QImage;
-
diff -urN /usr/ports/multimedia/dvbcut/files/patch-defines.h multimedia/dvbcut/files/patch-defines.h
--- /usr/ports/multimedia/dvbcut/files/patch-defines.h 2007-05-02 02:18:57.000000000 +0900
+++ multimedia/dvbcut/files/patch-defines.h 2009-03-27 01:33:25.000000000 +0900
@@ -1,6 +1,6 @@
---- src/defines.h~ Sun Dec 11 21:13:26 2005
-+++ src/defines.h Mon Dec 19 23:05:03 2005
-@@ -40,6 +40,12 @@
+--- src/defines.h.orig 2007-09-30 23:31:46.000000000 +0900
++++ src/defines.h 2009-03-27 01:33:10.000000000 +0900
+@@ -42,6 +42,12 @@
#endif
}
@@ -11,13 +11,12 @@
+#define htom16(x) htobe16(x)
+#else
#if __BYTE_ORDER == __LITTLE_ENDIAN
- #define mbo32(x) (__bswap_constant_32(x))
- #define htom32(x) (__bswap_32(x))
-@@ -50,6 +56,7 @@
- #define htom32(x) (x)
+ #define mbo32(x) \
+ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
+@@ -55,5 +61,6 @@
#define mbo16(x) (x)
#define htom16(x) (x)
-+#endif
#endif
++#endif
- #define DVBCUT_QSETTINGS_DOMAIN "dvbcut.sf.net"
+ #endif
diff -urN /usr/ports/multimedia/dvbcut/files/patch-index.h multimedia/dvbcut/files/patch-index.h
--- /usr/ports/multimedia/dvbcut/files/patch-index.h 2007-05-02 02:18:57.000000000 +0900
+++ multimedia/dvbcut/files/patch-index.h 2009-03-27 01:33:44.000000000 +0900
@@ -1,15 +1,14 @@
---- src/index.h~ Mon Dec 19 22:52:11 2005
-+++ src/index.h Mon Dec 19 23:05:24 2005
-@@ -20,7 +20,11 @@
+--- src/index.h.orig 2008-10-11 20:13:37.000000000 +0900
++++ src/index.h 2009-03-27 01:33:10.000000000 +0900
+@@ -22,7 +22,11 @@
#define _DVBCUT_INDEX_H
#include <stdint.h>
--#include <byteswap.h>
+#if defined(__FreeBSD__)
+#include <sys/endian.h>
+#else
-+#include <byteswap.h>
+ #include <byteswap.h>
+#endif
+ #include <set>
+ #include <vector>
#include "types.h"
- #include "pts.h"
- #include "defines.h"
diff -urN /usr/ports/multimedia/dvbcut/files/patch-lavfmuxer.cpp multimedia/dvbcut/files/patch-lavfmuxer.cpp
--- /usr/ports/multimedia/dvbcut/files/patch-lavfmuxer.cpp 2007-07-17 15:27:12.000000000 +0900
+++ multimedia/dvbcut/files/patch-lavfmuxer.cpp 1970-01-01 09:00:00.000000000 +0900
@@ -1,12 +0,0 @@
---- src/lavfmuxer.cpp~ 2007-04-13 19:36:27.000000000 +0200
-+++ src/lavfmuxer.cpp 2007-07-17 01:09:12 +0200
-@@ -16,7 +16,9 @@
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
- #include <string.h>
- #include <utility>
- #include <list>
diff -urN /usr/ports/multimedia/dvbcut/files/patch-main.cpp multimedia/dvbcut/files/patch-main.cpp
--- /usr/ports/multimedia/dvbcut/files/patch-main.cpp 2007-11-17 14:15:13.000000000 +0900
+++ multimedia/dvbcut/files/patch-main.cpp 1970-01-01 09:00:00.000000000 +0900
@@ -1,20 +0,0 @@
---- src/main.cpp~ 2007-04-13 19:36:26 +0200
-+++ src/main.cpp 2007-11-15 09:19:25 +0100
-@@ -27,7 +27,9 @@
- #endif // HAVE_LIB_AO
-
- #include <qapplication.h>
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
- #include <qimage.h>
- #include <qsettings.h>
- #include "dvbcut.h"
-@@ -76,6 +78,7 @@
- else
- idxfilename=mpgfilename+".idx";
-
-+ av_register_all();
- std::string errormessage;
- mpgfile *mpg=mpgfile::open(mpgfilename,&errormessage);
-
diff -urN /usr/ports/multimedia/dvbcut/files/patch-mpgfile.h multimedia/dvbcut/files/patch-mpgfile.h
--- /usr/ports/multimedia/dvbcut/files/patch-mpgfile.h 2007-07-17 15:27:12.000000000 +0900
+++ multimedia/dvbcut/files/patch-mpgfile.h 1970-01-01 09:00:00.000000000 +0900
@@ -1,12 +0,0 @@
---- src/mpgfile.h~ 2007-04-13 19:36:27 +0200
-+++ src/mpgfile.h 2007-07-17 01:10:56 +0200
-@@ -19,7 +19,9 @@
- #ifndef _DVBCUT_MPGFILE_H
- #define _DVBCUT_MPGFILE_H
-
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
- #include <string>
- #include <vector>
- #include <list>
diff -urN /usr/ports/multimedia/dvbcut/files/patch-playaudio.cpp multimedia/dvbcut/files/patch-playaudio.cpp
--- /usr/ports/multimedia/dvbcut/files/patch-playaudio.cpp 2007-07-17 16:19:53.000000000 +0900
+++ multimedia/dvbcut/files/patch-playaudio.cpp 1970-01-01 09:00:00.000000000 +0900
@@ -1,24 +0,0 @@
---- src/playaudio.cpp~ Fri Apr 13 19:36:27 2007
-+++ src/playaudio.cpp 2007-07-17 01:11:15 +0200
-@@ -19,7 +19,9 @@
- #ifdef HAVE_LIB_AO
- #include <stdio.h>
- #include <ao/ao.h>
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
- #include "playaudio.h"
-
- #define MIN_BUFFER_SAMPLES (1536*6)
-@@ -38,7 +40,10 @@
- const uint8_t *d=(const uint8_t*)data;
-
- while (len>0) {
-- int16_t samples[MIN_BUFFER_SAMPLES >? avcc->frame_size];
-+ int samples_dim = avcc->frame_size;
-+ if (samples_dim < MIN_BUFFER_SAMPLES)
-+ samples_dim = MIN_BUFFER_SAMPLES;
-+ int16_t samples[samples_dim];
- int frame_size;
-
- int bytesDecoded=avcodec_decode_audio(avcc,samples,&frame_size,(uint8_t*)d,len);
diff -urN /usr/ports/multimedia/dvbcut/files/patch-psfile.cpp multimedia/dvbcut/files/patch-psfile.cpp
--- /usr/ports/multimedia/dvbcut/files/patch-psfile.cpp 2007-11-17 14:15:13.000000000 +0900
+++ multimedia/dvbcut/files/patch-psfile.cpp 1970-01-01 09:00:00.000000000 +0900
@@ -1,41 +0,0 @@
---- src/psfile.cpp~ 2007-04-13 19:36:27.000000000 +0200
-+++ src/psfile.cpp 2007-11-15 09:40:42.110171154 +0100
-@@ -19,7 +19,9 @@
- #include "psfile.h"
- #include "streamhandle.h"
- #include "stream.h"
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-
- psfile::psfile(const std::string &filename, inbuffer &b, int initial_offset)
- : mpgfile(filename, b, initial_offset)
-@@ -90,7 +92,7 @@
- streamnumber[sid]=audiostream(audiostreams);
- stream *S=&s[audiostream(audiostreams++)];
- S->id=sid;
-- S->dec=&mp2_decoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MP2);
- S->type=streamtype::mpegaudio;
- if (audiostreams>=MAXAUDIOSTREAMS)
- break;
-@@ -100,7 +102,7 @@
- streamnumber[sid]=audiostream(audiostreams);
- stream *S=&s[audiostream(audiostreams++)];
- S->id=sid;
-- S->dec=&ac3_decoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_AC3);
- S->type=streamtype::ac3audio;
- if (audiostreams>=MAXAUDIOSTREAMS)
- break;
-@@ -114,8 +116,8 @@
- S->allocavcc();
- S->avcc->codec_type=CODEC_TYPE_VIDEO;
- S->avcc->codec_id=CODEC_ID_MPEG2VIDEO;
-- S->dec=&mpeg2video_decoder;
-- S->enc=&mpeg2video_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO);
-+ S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO);
- S->type=streamtype::mpeg2video;
- }
-
diff -urN /usr/ports/multimedia/dvbcut/files/patch-streamdata.h multimedia/dvbcut/files/patch-streamdata.h
--- /usr/ports/multimedia/dvbcut/files/patch-streamdata.h 2007-07-17 15:27:12.000000000 +0900
+++ multimedia/dvbcut/files/patch-streamdata.h 1970-01-01 09:00:00.000000000 +0900
@@ -1,12 +0,0 @@
---- src/streamdata.h~ 2007-04-13 19:36:27 +0200
-+++ src/streamdata.h 2007-07-17 01:12:01 +0200
-@@ -21,7 +21,9 @@
-
- #include <string>
- #include <list>
-+extern "C" {
- #include <ffmpeg/avformat.h>
-+}
-
- #include "port.h"
- #include "tsfile.h"
diff -urN /usr/ports/multimedia/dvbcut/files/patch-tsfile.cpp multimedia/dvbcut/files/patch-tsfile.cpp
--- /usr/ports/multimedia/dvbcut/files/patch-tsfile.cpp 2007-11-17 14:15:13.000000000 +0900
+++ multimedia/dvbcut/files/patch-tsfile.cpp 1970-01-01 09:00:00.000000000 +0900
@@ -1,40 +0,0 @@
---- src/tsfile.cpp~ 2007-04-13 19:36:27.000000000 +0200
-+++ src/tsfile.cpp 2007-11-15 09:38:58.606927367 +0100
-@@ -22,7 +22,9 @@
- #include <list>
- #include <utility>
-
-+extern "C" {
- #include <ffmpeg/avcodec.h>
-+}
-
- tsfile::tsfile(const std::string &filename, inbuffer &b, int initial_offset)
- : mpgfile(filename, b, initial_offset)
-@@ -78,12 +80,12 @@
- stream *S=&s[audiostream(audiostreams++)];
- S->id=it->second;
- if (it->first==0xbd) {
-- S->dec=&ac3_decoder;
-- S->enc=&ac3_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_AC3);
-+ S->enc=avcodec_find_encoder(CODEC_ID_AC3);
- S->type=streamtype::ac3audio;
- } else {
-- S->dec=&mp2_decoder;
-- S->enc=&mp2_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MP2);
-+ S->enc=avcodec_find_encoder(CODEC_ID_MP2);
- S->type=streamtype::mpegaudio;
- }
- if (audiostreams>=MAXAUDIOSTREAMS)
-@@ -98,8 +100,8 @@
- S->allocavcc();
- S->avcc->codec_type=CODEC_TYPE_VIDEO;
- S->avcc->codec_id=CODEC_ID_MPEG2VIDEO;
-- S->dec=&mpeg2video_decoder;
-- S->enc=&mpeg2video_encoder;
-+ S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO);
-+ S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO);
- S->type=streamtype::mpeg2video;
- }
-
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090403030042.f907dfd5.tkato432>