From owner-freebsd-ports Mon Dec 16 12:40:15 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1725A37B401 for ; Mon, 16 Dec 2002 12:40:11 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5ACEE43EC2 for ; Mon, 16 Dec 2002 12:40:04 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gBGKe4x3052831 for ; Mon, 16 Dec 2002 12:40:04 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gBGKe4Uf052830; Mon, 16 Dec 2002 12:40:04 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90A8037B404 for ; Mon, 16 Dec 2002 12:35:23 -0800 (PST) Received: from socigeog.hmt.toyama-u.ac.jp (socigeog.hmt.toyama-u.ac.jp [160.26.63.48]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B98743ED8 for ; Mon, 16 Dec 2002 12:35:18 -0800 (PST) (envelope-from tkato@prontomail.com) Received: from localhost (localhost [127.0.0.1]) by socigeog.hmt.toyama-u.ac.jp (Postfix) with SMTP id 9EE259B7 for ; Tue, 17 Dec 2002 05:35:13 +0900 (JST) Message-Id: <20021217053158.16ed141e.tkato@prontomail.com> Date: Tue, 17 Dec 2002 05:31:58 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46296: Update port: graphics/tosvcd to 0.9 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46296 >Category: ports >Synopsis: Update port: graphics/tosvcd to 0.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 16 12:40:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.7-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 0.9 >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/tosvcd/Makefile graphics/tosvcd/Makefile --- /usr/ports/graphics/tosvcd/Makefile Fri Nov 29 19:08:33 2002 +++ graphics/tosvcd/Makefile Sat Dec 14 07:27:52 2002 @@ -7,7 +7,7 @@ # PORTNAME= tosvcd -PORTVERSION= 0.7 +PORTVERSION= 0.9 CATEGORIES= graphics MASTER_SITES= http://muse.seh.de/tosvcd/ @@ -17,18 +17,10 @@ vcdimager:${PORTSDIR}/graphics/vcdimager USE_BZIP2= yes -USE_REINPLACE= yes -MAKEFILE= makefile USE_GMAKE= yes - -post-patch: - @${REINPLACE_CMD} -e "s|^CFLAGS =|CFLAGS+=|" \ - -e "s|^CFLAGS +=|#CFLAGS +=|g" \ - -e "s|-lpthread|${PTHREAD_LIBS}|g" \ - ${WRKSRC}/${MAKEFILE} - @${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|" ${WRKSRC}/decode.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/tosvcd ${PREFIX}/bin +MAKEFILE= makefile +MAKE_ENV= CC="${CXX}" CFLAGS="${CXXFLAGS}" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" .include diff -urN /usr/ports/graphics/tosvcd/distinfo graphics/tosvcd/distinfo --- /usr/ports/graphics/tosvcd/distinfo Fri Oct 25 17:12:42 2002 +++ graphics/tosvcd/distinfo Sat Dec 14 07:16:50 2002 @@ -1 +1 @@ -MD5 (tosvcd-0.7.tar.bz2) = d821ed70eed67dae5fbbc041217f327f +MD5 (tosvcd-0.9.tar.bz2) = 696c55f668e2019ffa87d9e11902451a diff -urN /usr/ports/graphics/tosvcd/files/patch-decode.c graphics/tosvcd/files/patch-decode.c --- /usr/ports/graphics/tosvcd/files/patch-decode.c Fri Oct 25 17:12:42 2002 +++ graphics/tosvcd/files/patch-decode.c Sat Dec 14 07:25:44 2002 @@ -1,6 +1,14 @@ ---- decode.c.orig Fri Oct 25 16:01:13 2002 -+++ decode.c Fri Oct 25 16:01:31 2002 -@@ -21,7 +21,7 @@ +--- decode.c.orig Wed Dec 4 22:40:42 2002 ++++ decode.c Sat Dec 14 07:25:35 2002 +@@ -8,7 +8,6 @@ + #include "mm_accel.h" + #include "attributes.h" + #include "mmx.h" +-#include "malloc.h" + + extern FILE* log; + +@@ -21,7 +20,7 @@ Mpeg2dec::Mpeg2dec(uint32_t mm_accel) { config.flags = mm_accel; @@ -9,7 +17,7 @@ memset(picture, 0, sizeof (picture_t)); frames = 0; frame_ptr[0] = 0; -@@ -66,7 +66,7 @@ +@@ -63,7 +62,7 @@ int size = width() * height() / 4; if (frames) free(frames); diff -urN /usr/ports/graphics/tosvcd/files/patch-makefile graphics/tosvcd/files/patch-makefile --- /usr/ports/graphics/tosvcd/files/patch-makefile Fri Oct 25 17:12:42 2002 +++ graphics/tosvcd/files/patch-makefile Sat Dec 14 07:27:08 2002 @@ -1,11 +1,39 @@ ---- makefile.orig Fri Oct 25 16:04:05 2002 -+++ makefile Fri Oct 25 16:04:25 2002 -@@ -21,7 +21,7 @@ +--- makefile.orig Wed Dec 4 22:40:42 2002 ++++ makefile Sat Dec 14 07:27:00 2002 +@@ -1,15 +1,15 @@ + # use intel compiler 0.6.x + INTEL = no + +-CFLAGS = -DVERSION="\"0.9\"" ++CFLAGS += -DVERSION="\"0.9\"" + + ifeq ($(INTEL),yes) + #CC = icc -I/usr/lib/gcc-lib/i686-pc-linux-gnu/2.95.3/include -Kc++ -O -tpp6 -xiMK + CC = icc -Kc++ -O -tpp6 -xiMK + #CC = icc + else +-CC = g++ +-CFLAGS += -g -Wall -O3 -fno-exceptions -fno-rtti ++CC ?= g++ ++CFLAGS += -fno-exceptions -fno-rtti ${PTHREAD_CFLAGS} + endif + + SRC = tosvcd decode header idct idct_mmx motion_comp +@@ -20,15 +20,13 @@ + all: tosvcd tosvcd: $(OBJ) - $(CC) -o tosvcd $(OBJ) -lpthread +- $(CC) -o tosvcd $(OBJ) -lpthread - su -c "cp tosvcd /usr/bin" -+# su -c "cp tosvcd /usr/bin" ++ $(CC) -o tosvcd $(OBJ) ${PTHREAD_LIBS} t: - ./tosvcd -o reeperbahn /video0/Auf_der_Reeperbahn_nachts_um_halb_eins/2002-03-09.15:21.50.50.rec + ./tosvcd -o mafia /home/ws/videos/Mafia/2002-10-21.00:33.50.50.rec + + install:: +- su -c "mv /usr/bin/tosvcd /usr/bin/tosvcd.old" +- su -c "cp tosvcd /usr/bin" ++ ${BSD_INSTALL_PROGRAM} tosvcd ${PREFIX}/bin + + clean: + rm *.o diff -urN /usr/ports/graphics/tosvcd/files/patch-tosvcd.c graphics/tosvcd/files/patch-tosvcd.c --- /usr/ports/graphics/tosvcd/files/patch-tosvcd.c Mon Nov 25 22:18:57 2002 +++ graphics/tosvcd/files/patch-tosvcd.c Sat Dec 14 07:22:05 2002 @@ -1,6 +1,6 @@ ---- tosvcd.c.orig Fri Sep 13 10:08:52 2002 -+++ tosvcd.c Mon Nov 18 16:56:27 2002 -@@ -24,14 +24,12 @@ +--- tosvcd.c.orig Mon Dec 9 18:24:57 2002 ++++ tosvcd.c Sat Dec 14 07:21:57 2002 +@@ -20,14 +20,12 @@ #include #include #include @@ -15,13 +15,4 @@ +#include #include - -@@ -1322,7 +1320,7 @@ - // catch all signals - //--------------------------------------------------- - #if 1 -- for (int i = 0; i < _NSIG; ++i) { -+ for (int i = 0; i < NSIG; ++i) { - if (i != SIGABRT) - signal(i, catchSignal); - } + #include "mm_accel.h" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message