svn commit: r363283 - in head/multimedia: camserv camserv/files dtv/files fxtv/files mpeg2codec/files mpeg2play mpeg2play/files mpeg_encode/files mpeg_play/files mplex/files smpeg/files xanim/files
Adam Weinberger
adamw at FreeBSD.org
Tue Jul 29 01:31:18 UTC 2014
Author: adamw
Date: Tue Jul 29 01:31:13 2014
New Revision: 363283
URL: http://svnweb.freebsd.org/changeset/ports/363283
QAT: https://qat.redports.org/buildarchive/r363283/
Log:
Rename multimedia/ patch-xy patches to reflect the files they modify.
Added:
head/multimedia/camserv/files/patch-Makefile.in
- copied unchanged from r363257, head/multimedia/camserv/files/patch-ad
head/multimedia/camserv/files/patch-camserv_video_fbsd_bttv.c
- copied unchanged from r363257, head/multimedia/camserv/files/patch-ab
head/multimedia/dtv/files/patch-defs.h
- copied unchanged from r363257, head/multimedia/dtv/files/patch-aa
head/multimedia/fxtv/files/patch-remote.c
- copied unchanged from r363257, head/multimedia/fxtv/files/patch-ae
head/multimedia/fxtv/files/patch-videolib_Makefile
- copied unchanged from r363257, head/multimedia/fxtv/files/patch-ac
head/multimedia/fxtv/files/patch-voxware.h
- copied unchanged from r363257, head/multimedia/fxtv/files/patch-ad
head/multimedia/mpeg2codec/files/patch-src_mpeg2enc_mpeg2enc.c
- copied unchanged from r363257, head/multimedia/mpeg2codec/files/patch-ab
head/multimedia/mpeg2play/files/patch-Imakefile
- copied unchanged from r363257, head/multimedia/mpeg2play/files/patch-ab
head/multimedia/mpeg2play/files/patch-mpeg2play.c
- copied unchanged from r363257, head/multimedia/mpeg2play/files/patch-aa
head/multimedia/mpeg_encode/files/patch-Makefile
- copied unchanged from r363257, head/multimedia/mpeg_encode/files/patch-ac
head/multimedia/mpeg_encode/files/patch-header_libpnmrw.h
- copied unchanged from r363257, head/multimedia/mpeg_encode/files/patch-aa
head/multimedia/mpeg_encode/files/patch-jpeg_Makefile
- copied unchanged from r363257, head/multimedia/mpeg_encode/files/patch-ad
head/multimedia/mpeg_encode/files/patch-libpnmrw.c
- copied unchanged from r363257, head/multimedia/mpeg_encode/files/patch-ab
head/multimedia/mpeg_play/files/patch-Imakefile
- copied unchanged from r363257, head/multimedia/mpeg_play/files/patch-aa
head/multimedia/mplex/files/patch-Makefile
- copied unchanged from r363257, head/multimedia/mplex/files/patch-ab
head/multimedia/mplex/files/patch-inptstrm.c
- copied unchanged from r363257, head/multimedia/mplex/files/patch-ac
head/multimedia/mplex/files/patch-interact.c
- copied unchanged from r363257, head/multimedia/mplex/files/patch-ae
head/multimedia/mplex/files/patch-main.c
- copied unchanged from r363257, head/multimedia/mplex/files/patch-af
head/multimedia/mplex/files/patch-multplex.c
- copied unchanged from r363257, head/multimedia/mplex/files/patch-ad
head/multimedia/smpeg/files/patch-gtv.c
- copied unchanged from r363257, head/multimedia/smpeg/files/patch-ab
head/multimedia/xanim/files/patch-Imakefile
- copied unchanged from r363257, head/multimedia/xanim/files/patch-ab
Deleted:
head/multimedia/camserv/files/patch-ab
head/multimedia/camserv/files/patch-ad
head/multimedia/dtv/files/patch-aa
head/multimedia/fxtv/files/patch-ac
head/multimedia/fxtv/files/patch-ad
head/multimedia/fxtv/files/patch-ae
head/multimedia/mpeg2codec/files/patch-ab
head/multimedia/mpeg2play/files/patch-aa
head/multimedia/mpeg2play/files/patch-ab
head/multimedia/mpeg_encode/files/patch-aa
head/multimedia/mpeg_encode/files/patch-ab
head/multimedia/mpeg_encode/files/patch-ac
head/multimedia/mpeg_encode/files/patch-ad
head/multimedia/mpeg_play/files/patch-aa
head/multimedia/mplex/files/patch-ab
head/multimedia/mplex/files/patch-ac
head/multimedia/mplex/files/patch-ad
head/multimedia/mplex/files/patch-ae
head/multimedia/mplex/files/patch-af
head/multimedia/smpeg/files/patch-ab
head/multimedia/xanim/files/patch-ab
Modified:
head/multimedia/camserv/Makefile
head/multimedia/mpeg2play/Makefile
Modified: head/multimedia/camserv/Makefile
==============================================================================
--- head/multimedia/camserv/Makefile Tue Jul 29 01:16:45 2014 (r363282)
+++ head/multimedia/camserv/Makefile Tue Jul 29 01:31:13 2014 (r363283)
@@ -27,25 +27,14 @@ OPTIONS_DEFINE= IMLIB2 PIXBUF V4L DOCS
OPTIONS_DEFAULT=IMLIB2
OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
+IMLIB2_USE= EFL=imlib2
+IMLIB2_CONFIGURE_OFF= ac_cv_path_IMLIB2_CONFIG=no
-.if ${PORT_OPTIONS:MIMLIB2}
-USE_EFL+= imlib2
-.else
-CONFIGURE_ENV+= ac_cv_path_IMLIB2_CONFIG=no
-.endif
-
-.if ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+= gdkpixbuf
-.else
-CONFIGURE_ENV+= ac_cv_path_GDKPIXBUF_CONFIG=no
-.endif
-
-.if ${PORT_OPTIONS:MV4L}
-BUILD_DEPENDS+= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
-.else
-CONFIGURE_ENV= ac_cv_header_linux_videodev_h=no
-.endif
+PIXBUF_USE= GNOME=gdkpixbuf
+PIXBUF_CONFIGURE_OFF= ac_cv_path_GDKPIXBUF_CONFIG=no
+
+V4L_BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+V4L_CONFIGURE_OFF= ac_cv_header_linux_videodev_h=no
post-patch:
@${REINPLACE_CMD} -e \
Copied: head/multimedia/camserv/files/patch-Makefile.in (from r363257, head/multimedia/camserv/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/camserv/files/patch-Makefile.in Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/camserv/files/patch-ad)
@@ -0,0 +1,29 @@
+--- Makefile.in.orig Mon Sep 16 00:28:04 2002
++++ Makefile.in Fri Mar 19 19:35:48 2004
+@@ -99,15 +99,14 @@
+ install_sh = @install_sh@
+ @VALID_VIDEO_TRUE at camserv_subdir = camserv
+
+-SUBDIRS = libltdl \
+- common \
++SUBDIRS = common \
+ ${camserv_subdir} \
+ include \
+ macros \
+ relay
+
+
+-data_DATA = camserv.cfg defpage.html
++data_DATA = camserv.cfg.dist defpage.html
+ EXTRA_DIST = camserv.cfg.in javascript.txt BUGS camserv.spec defpage.html
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -463,7 +462,7 @@
+ uninstall-info-recursive uninstall-recursive
+
+
+-camserv.cfg: camserv.cfg.in
++camserv.cfg.dist: camserv.cfg.in
+ @sed -e s%CAMSERV_MODDIR%$(CAMSERV_MODDIR)%g < camserv.cfg.in > $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Copied: head/multimedia/camserv/files/patch-camserv_video_fbsd_bttv.c (from r363257, head/multimedia/camserv/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/camserv/files/patch-camserv_video_fbsd_bttv.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/camserv/files/patch-ab)
@@ -0,0 +1,23 @@
+--- camserv/video_fbsd_bttv.c.orig 2002-09-16 07:01:56.000000000 +0900
++++ camserv/video_fbsd_bttv.c 2014-01-04 04:56:21.000000000 +0900
+@@ -27,8 +27,9 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <sys/mman.h>
+-#include <machine/ioctl_bt848.h>
+-#include <machine/ioctl_meteor.h>
++#include <sys/types.h>
++#include <dev/bktr/ioctl_bt848.h>
++#include <dev/bktr/ioctl_meteor.h>
+ #include <signal.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+@@ -642,7 +643,7 @@
+ return 0;
+
+ totmean = camserv_get_pic_mean( width, height, picbuf, 1, 0, 0,
+- width, height );
++ width-1, height-1 );
+ if( totmean < (256 / 2) - 10 || totmean > (256 / 2) + 10 ) {
+ newbright = fbttv_dev->brightness;
+ if( totmean > (256 / 2) + 10 ){
Copied: head/multimedia/dtv/files/patch-defs.h (from r363257, head/multimedia/dtv/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/dtv/files/patch-defs.h Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/dtv/files/patch-aa)
@@ -0,0 +1,21 @@
+--- defs.h.orig Mon Feb 11 04:14:17 2002
++++ defs.h Sun Feb 1 20:01:30 2004
+@@ -10,9 +10,17 @@
+ #include <sys/mman.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
++#ifdef __FreeBSD__
++#include <osreldate.h>
++#if __FreeBSD_version > 500000
++#include <dev/bktr/ioctl_bt848.h>
++#include <dev/bktr/ioctl_meteor.h>
++#else
+ #include <machine/ioctl_bt848.h>
+ #include <machine/ioctl_meteor.h>
+-#include <machine/soundcard.h>
++#endif
++#endif
++#include <sys/soundcard.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
Copied: head/multimedia/fxtv/files/patch-remote.c (from r363257, head/multimedia/fxtv/files/patch-ae)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/fxtv/files/patch-remote.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/fxtv/files/patch-ae)
@@ -0,0 +1,11 @@
+--- remote.c.orig Sat Sep 7 16:54:12 2002
++++ remote.c Sat Sep 7 16:54:24 2002
+@@ -65,7 +65,7 @@
+ /* ******************** Local defines ************** */
+
+ /* FIXME: Remove this old code someday */
+-#ifdef 0
++#if 0
+ # define OLD_DEV_SYSMOUSE_STUFF
+ #endif
+
Copied: head/multimedia/fxtv/files/patch-videolib_Makefile (from r363257, head/multimedia/fxtv/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/fxtv/files/patch-videolib_Makefile Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/fxtv/files/patch-ac)
@@ -0,0 +1,11 @@
+--- videolib/Makefile.orig Tue Feb 13 06:04:45 2001
++++ videolib/Makefile Sat Mar 10 17:39:59 2001
+@@ -15,7 +15,7 @@
+ ifneq ($(DEBUG),NO)
+ override CFLAGS = -DDEBUG -g
+ else
+- override CFLAGS = -DNDEBUG -O2
++ override CFLAGS += -DNDEBUG #-O2
+ endif
+ C_WARN_FLAG = -Wall
+ override CFLAGS += $(C_WARN_FLAG) $(INC)
Copied: head/multimedia/fxtv/files/patch-voxware.h (from r363257, head/multimedia/fxtv/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/fxtv/files/patch-voxware.h Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/fxtv/files/patch-ad)
@@ -0,0 +1,13 @@
+--- voxware.h.orig Sat Sep 7 16:51:45 2002
++++ voxware.h Sat Sep 7 16:51:58 2002
+@@ -30,9 +30,7 @@
+ #ifndef __VOXWARE_H
+ #define __VOXWARE_H
+
+-#if defined(__FreeBSD__)
+-# include <machine/soundcard.h>
+-#elif defined(linux) || defined(__bsdi__)
++#if defined(linux) || defined(__bsdi__) || defined(__FreeBSD__)
+ # include <sys/soundcard.h>
+ #elif defined(__NetBSD__) || defined(__OpenBSD__)
+ # include <soundcard.h>
Copied: head/multimedia/mpeg2codec/files/patch-src_mpeg2enc_mpeg2enc.c (from r363257, head/multimedia/mpeg2codec/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mpeg2codec/files/patch-src_mpeg2enc_mpeg2enc.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mpeg2codec/files/patch-ab)
@@ -0,0 +1,23 @@
+--- ./src/mpeg2enc/mpeg2enc.c 1996/11/25 21:18:23 1.1
++++ ./src/mpeg2enc/mpeg2enc.c 1996/11/25 21:22:40
+@@ -29,6 +29,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <floatingpoint.h>
+
+ #define GLOBAL /* used by global.h */
+ #include "config.h"
+@@ -50,6 +51,12 @@
+ printf("Usage: mpeg2encode in.par out.m2v\n");
+ exit(0);
+ }
++
++ /*
++ * this prevents a floating point exception in calcSNR (stats.c) when
++ * working on black and white images (charnier at lirmm.fr)
++ */
++ fpsetmask(0);
+
+ /* read parameter file */
+ readparmfile(argv[1]);
Modified: head/multimedia/mpeg2play/Makefile
==============================================================================
--- head/multimedia/mpeg2play/Makefile Tue Jul 29 01:16:45 2014 (r363282)
+++ head/multimedia/mpeg2play/Makefile Tue Jul 29 01:31:13 2014 (r363283)
@@ -17,9 +17,9 @@ ALL_TARGET= mpeg2play
OPTIONS_DEFINE= DOCS
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mpeg2play ${STAGEDIR}${PREFIX}/bin/
- ${INSTALL_DATA} ${WRKSRC}/Mpeg2play ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/
+ ${INSTALL_PROGRAM} ${WRKSRC}/mpeg2play ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/Mpeg2play ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Copied: head/multimedia/mpeg2play/files/patch-Imakefile (from r363257, head/multimedia/mpeg2play/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mpeg2play/files/patch-Imakefile Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mpeg2play/files/patch-ab)
@@ -0,0 +1,11 @@
+--- Imakefile.orig Fri Oct 28 12:39:48 1994
++++ Imakefile Sat Nov 14 16:29:42 1998
+@@ -15,7 +15,7 @@
+
+ EXTRA_DEFINES = $(USE_SHMEM) $(USE_TIME)
+ EXTRA_INCLUDES = -I. -Ibitmaps
+-LOCAL_LIBRARIES = $(SHM_LIB) -lXm -lXt -lX11 -lm
++LOCAL_LIBRARIES = $(SHM_LIB) ${MOTIFLIB} -lXt -lX11 -lm
+
+ PROGRAM = mpeg2play
+ SRCS = mpeg2play.c getpic.c motion.c getvlc.c gethdr.c getblk.c \
Copied: head/multimedia/mpeg2play/files/patch-mpeg2play.c (from r363257, head/multimedia/mpeg2play/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mpeg2play/files/patch-mpeg2play.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mpeg2play/files/patch-aa)
@@ -0,0 +1,11 @@
+--- mpeg2play.c 1997/08/11 18:58:37 1.1
++++ mpeg2play.c 1997/08/11 19:07:22
+@@ -335,7 +335,7 @@
+ XmStringGetLtoR(((XmFileSelectionBoxCallbackStruct *)call_data)->value,
+ XmSTRING_DEFAULT_CHARSET, &filename);
+
+- position = tell(base.infile);
++ position = lseek(base.infile, 0L, SEEK_CUR);
+ fprintf(stderr, "pos: %d\n", position);
+ fprintf(stderr, "output: %s\n", filename);
+
Copied: head/multimedia/mpeg_encode/files/patch-Makefile (from r363257, head/multimedia/mpeg_encode/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mpeg_encode/files/patch-Makefile Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mpeg_encode/files/patch-ac)
@@ -0,0 +1,20 @@
+--- Makefile~ Wed Aug 16 17:16:56 1995
++++ Makefile Fri Oct 20 19:20:05 2000
+@@ -68,7 +68,7 @@
+ #####################################################################
+ # COMPILER # specify compiler; should be ANSI-compliant if possible #
+ #####################################################################
+-CC = gcc
++CC ?= gcc
+
+ ################################################
+ # MAKE # command to use for the "make" command #
+@@ -96,7 +96,7 @@
+ #
+
+ # gcc
+-CFLAGS = $(INCLUDEDIR) $(DEBUGFLAG) -Wall -Wmissing-prototypes $(PROFLAG) $(PROTOFLAG)
++CFLAGS += $(INCLUDEDIR) -Wall -Wmissing-prototypes $(PROFLAG) $(PROTOFLAG)
+
+ # gcc-strict
+ #CFLAGS = $(INCLUDEDIR) $(DEBUGFLAG) -pedantic -Wall -Waggregate-return -Wtraditional -Wshadow -Wpointer-arith -Wno-parentheses -Wwrite-strings -Wconversion -Wcast-qual -Wcast-align -Wnested-externs -Wuninitialized -Wmissing-prototypes $(PROFLAG) $(PROTOFLAG)
Copied: head/multimedia/mpeg_encode/files/patch-header_libpnmrw.h (from r363257, head/multimedia/mpeg_encode/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mpeg_encode/files/patch-header_libpnmrw.h Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mpeg_encode/files/patch-aa)
@@ -0,0 +1,11 @@
+--- headers/libpnmrw.h.orig Wed Aug 9 11:17:41 1995
++++ headers/libpnmrw.h Tue Jul 23 17:06:15 2002
+@@ -20,7 +20,7 @@
+ ** that point here, feel free to tweak or remove these declarations.
+ */
+ #include <malloc.h>
+-#if !defined(sco) && !defined(sgi) && !defined(IRIX)
++#if !defined(sco) && !defined(sgi) && !defined(IRIX) && !defined(__FreeBSD__)
+ extern char* malloc();
+ #endif
+ /* End of configurable definitions. */
Copied: head/multimedia/mpeg_encode/files/patch-jpeg_Makefile (from r363257, head/multimedia/mpeg_encode/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mpeg_encode/files/patch-jpeg_Makefile Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mpeg_encode/files/patch-ad)
@@ -0,0 +1,15 @@
+--- jpeg/Makefile.orig Fri Aug 4 18:27:00 1995
++++ jpeg/Makefile Fri Oct 20 19:05:22 2000
+@@ -21,10 +21,10 @@
+ manext = 1
+
+ # The name of your C compiler:
+-CC= gcc
++CC?= gcc
+
+ # You may need to adjust these cc options:
+-CFLAGS= -O -I$(srcdir)
++CFLAGS+= -I$(srcdir)
+ # Generally, we recommend defining any configuration symbols in jconfig.h,
+ # NOT via -D switches here.
+ # However, any special defines for ansi2knr.c may be included here:
Copied: head/multimedia/mpeg_encode/files/patch-libpnmrw.c (from r363257, head/multimedia/mpeg_encode/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mpeg_encode/files/patch-libpnmrw.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mpeg_encode/files/patch-ab)
@@ -0,0 +1,11 @@
+--- ./libpnmrw.c~ Thu Aug 1 08:52:14 1996
++++ ./libpnmrw.c Thu Aug 1 08:51:26 1996
+@@ -126,7 +126,9 @@
+ pm_perror( reason )
+ char* reason;
+ {
++#ifndef __FreeBSD__
+ extern char* sys_errlist[];
++#endif
+ extern int errno;
+ char* e;
Copied: head/multimedia/mpeg_play/files/patch-Imakefile (from r363257, head/multimedia/mpeg_play/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mpeg_play/files/patch-Imakefile Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mpeg_play/files/patch-aa)
@@ -0,0 +1,9 @@
+--- ./Imakefile.org Tue Feb 6 23:37:51 1996
++++ ./Imakefile Wed Feb 7 00:05:59 1996
+@@ -1,5 +1,5 @@
+ /* See Makefile.proto for flags to define */
+- DESTDIR = /usr/pkg/video
++ /* DESTDIR = /usr/pkg/video */
+ NDEBUG = /* -DNDEBUG */
+ /*ANALYSIS = -DANALYSIS */
+ SHMEM = -DSH_MEM
Copied: head/multimedia/mplex/files/patch-Makefile (from r363257, head/multimedia/mplex/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mplex/files/patch-Makefile Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mplex/files/patch-ab)
@@ -0,0 +1,17 @@
+--- Makefile.orig Tue Apr 11 02:46:13 1995
++++ Makefile Mon Sep 4 18:13:42 2000
+@@ -19,10 +19,12 @@
+
+ #CFLAGS = -g
+
+-CFLAGS = -O
++CFLAGS?= -O
+ LDFLAGS= -lm
+-CC = cc
++CC ?= cc
+ RM = /bin/rm -f
++
++CFLAGS+= -DTIMER
+
+ OBJS = main.o bitstrm.o buffer.o inits.o inptstrm.o interact.o multplex.o systems.o timecode.o
+
Copied: head/multimedia/mplex/files/patch-inptstrm.c (from r363257, head/multimedia/mplex/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mplex/files/patch-inptstrm.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mplex/files/patch-ac)
@@ -0,0 +1,24 @@
+--- inptstrm.c.orig Wed May 31 08:04:11 1995
++++ inptstrm.c Mon Sep 4 18:17:45 2000
+@@ -1,4 +1,5 @@
+ #include "main.h"
++extern int Interactive;
+ /*************************************************************************
+ MPEG Streams Kontrolle
+
+@@ -310,6 +311,7 @@
+ fclose (info_file);
+ output_info_video (video_info);
+
++ if( Interactive )
+ ask_continue ();
+ }
+
+@@ -565,6 +567,7 @@
+ close_bit_stream_r (&audio_bs);
+ fclose (info_file);
+ output_info_audio (audio_info);
++ if( Interactive )
+ ask_continue ();
+
+ }
Copied: head/multimedia/mplex/files/patch-interact.c (from r363257, head/multimedia/mplex/files/patch-ae)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mplex/files/patch-interact.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mplex/files/patch-ae)
@@ -0,0 +1,20 @@
+--- interact.c.orig Wed May 31 20:18:33 1995
++++ interact.c Fri Feb 11 10:04:07 2000
+@@ -67,7 +67,7 @@
+ char input[20];
+
+ printf ("\nContinue processing (y/n) : ");
+- do gets (input);
++ do fgets (input, sizeof(input), stdin);
+ while (input[0]!='N'&&input[0]!='n'&&input[0]!='y'&&input[0]!='Y');
+
+ if (input[0]=='N' || input[0]=='n')
+@@ -92,7 +92,7 @@
+ char input[20];
+
+ printf ("\nVery verbose mode (y/n) : ");
+- do gets (input);
++ do fgets (input, sizeof(input), stdin);
+ while (input[0]!='N'&&input[0]!='n'&&input[0]!='y'&&input[0]!='Y');
+
+ if (input[0]=='N' || input[0]=='n') return (FALSE); else return (TRUE);
Copied: head/multimedia/mplex/files/patch-main.c (from r363257, head/multimedia/mplex/files/patch-af)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mplex/files/patch-main.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mplex/files/patch-af)
@@ -0,0 +1,34 @@
+--- main.c.orig Wed Apr 5 03:51:53 1995
++++ main.c Mon Sep 4 18:17:45 2000
+@@ -59,6 +59,7 @@
+ *************************************************************************/
+
+ #include "main.h"
++#include <unistd.h>
+
+ /*************************************************************************
+ Main
+@@ -75,6 +76,8 @@
+ struct timeval tp_global_end;
+ #endif
+
++int Interactive=0;
++
+ int main (argc, argv)
+
+ int argc;
+@@ -93,6 +96,14 @@
+ unsigned int which_streams=0;
+ double startup_delay=0;
+
++ int tmp;
++
++ if( getopt( argc, argv, "i" ) == 'i' )
++ Interactive=1;
++
++ optind -= 1;
++ argc -= optind;
++ argv += optind;
+
+ intro (argc);
+ check_files (argc, argv, &audio_file, &video_file, &multi_file,
Copied: head/multimedia/mplex/files/patch-multplex.c (from r363257, head/multimedia/mplex/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mplex/files/patch-multplex.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/mplex/files/patch-ad)
@@ -0,0 +1,59 @@
+--- multplex.c.orig Tue Jun 6 07:16:52 1995
++++ multplex.c Mon Sep 4 18:17:45 2000
+@@ -1,4 +1,5 @@
+ #include "main.h"
++extern int Interactive;
+ #ifdef TIMER
+ extern long total_sec;
+ extern long total_usec;
+@@ -129,6 +130,7 @@
+ picture_start = TRUE;
+ }
+
++if( Interactive ) {
+ printf("\nMerging elementary streams to MPEG/SYSTEMS multiplexed stream.\n");
+ printf("\n+------------------ MPEG/SYSTEMS INFORMATION -----------------+\n");
+
+@@ -144,6 +146,12 @@
+ scanf ("%ld", &video_buffer_size);
+ printf ("STD audio buffer in kB (CSPS: max 4 kB) : ");
+ scanf ("%ld", &audio_buffer_size);
++} else {
++ sector_size=2324;
++ packets_per_pack=1;
++ video_buffer_size=46;
++ audio_buffer_size=4;
++}
+
+ write_pack = packets_per_pack;
+ video_buffer_size *= 1024;
+@@ -197,6 +205,7 @@
+ (double)(packets_per_pack-1.))) / (double)(packets_per_pack) );
+ data_rate = ceil(dmux_rate/50.)*50;
+
++if( Interactive ) {
+ printf ("\ncomputed multiplexed stream data rate : %7.3f\n",dmux_rate);
+ printf ("target data rate (e.g. %6u) : ",data_rate);
+ scanf ("%lf", &dmux_rate);
+@@ -206,12 +215,21 @@
+ scanf ("%u", &video_delay_ms);
+ printf ("audio stream startup offset (ms) : ");
+ scanf ("%u", &audio_delay_ms);
++} else {
++ dmux_rate=data_rate;
++ sectors_delay=8;
++ video_delay_ms=0;
++ audio_delay_ms=0;
++}
+
+ video_delay = (double)video_delay_ms*(double)(CLOCKS/1000);
+ audio_delay = (double)audio_delay_ms*(double)(CLOCKS/1000);
+
++if( Interactive ) {
+ verbose=ask_verbose();
+ printf ("\n");
++} else
++ verbose=1;
+
+ #ifdef TIMER
+ gettimeofday (&tp_global_start,NULL);
Copied: head/multimedia/smpeg/files/patch-gtv.c (from r363257, head/multimedia/smpeg/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/smpeg/files/patch-gtv.c Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/smpeg/files/patch-ab)
@@ -0,0 +1,10 @@
+--- gtv.c.orig Sun Mar 26 00:18:54 2000
++++ gtv.c Sun Mar 26 00:19:17 2000
+@@ -726,6 +726,7 @@
+ memset( &info, 0, sizeof( info ) );
+ memset( &filename_buffer, 0, sizeof( gchar ) * FILENAME_BUFFER_SIZE );
+ gtk_init( &argc, &argv );
++ gtk_set_locale ();
+
+ window = create_gtv_window( );
+ gtk_signal_connect( GTK_OBJECT( window ), "destroy",
Copied: head/multimedia/xanim/files/patch-Imakefile (from r363257, head/multimedia/xanim/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/xanim/files/patch-Imakefile Tue Jul 29 01:31:13 2014 (r363283, copy of r363257, head/multimedia/xanim/files/patch-ab)
@@ -0,0 +1,80 @@
+--- Imakefile.orig Sun Apr 21 01:25:06 2002
++++ Imakefile Thu Jan 2 07:53:41 2003
+@@ -96,7 +96,7 @@
+ XCOMM to link against symbols inside xanim.
+ XCOMM
+ XCOMM ## Linux
+-XCOMM LD_FLAGS = -rdynamic
++LD_FLAGS = -rdynamic
+ XCOMM
+ XCOMM ## SunOS/Solaris use:
+ XCOMM LD_FLAGS =
+@@ -112,7 +112,7 @@
+ XCOMM NOTE: not all machines need the XA_DLL_LIB define.
+ XCOMM #########################################################################
+ XCOMM
+-XCOMM XA_DLL_DEF = -DXA_DLL -DXA_PRINT
++XA_DLL_DEF = -DXA_DLL -DXA_PRINT
+ XCOMM ### Use this only if the above doesn't work
+ XCOMM XA_DLL_DEF = -DXA_DLL
+ XCOMM
+@@ -120,14 +120,14 @@
+ XCOMM XA_DLL_LIB = -ldl
+ XCOMM
+ XCOMM HP/UX should use the following:
+-XA_DLL_DEF = -DXA_HPDLL
+-XA_DLL_LIB = -Wl,-E -ldld
++XCOMM XA_DLL_DEF = -DXA_HPDLL
++XCOMM XA_DLL_LIB = -Wl,-E -ldld
+ XCOMM
+ XCOMM
+ XCOMM If you'd like to change the default directory that XAnim searches while
+ XCOMM looking for dlls, then change the directory below.
+ XCOMM
+-XA_DLL_PATH = /usr/local/xanim/mods
++XA_DLL_PATH = $(LIBDIR)/xanim
+
+
+ XCOMM #########################################################################
+@@ -319,8 +319,8 @@
+ XCOMM XA_AUDIO_LIBS = -lc
+ XCOMM
+ XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------
+-XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
+-XCOMM XA_AUDIO_LIBS = -lc
++XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
++XA_AUDIO_LIBS = -lc
+ XCOMM
+ XCOMM -- TOWNS Linux 16 bit PCM ----------------------------------------------
+ XCOMM XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO
+@@ -351,9 +351,9 @@
+ XCOMM XA_AUDIO_LIBS = -lAlib
+ XCOMM --
+ XCOMM -- HP/UX 10.x AServer
+-XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
+-XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
+-XA_AUDIO_INCS = -I/opt/audio/include
++XCOMM XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
++XCOMM XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
++XCOMM XA_AUDIO_INCS = -I/opt/audio/include
+ XCOMM
+ XCOMM ------ AF (AudioFile) Support ------------------------------------------
+ XCOMM -- You need to indicate where the AF libraries libAFUtil.a and libAF.a
+@@ -447,7 +447,7 @@
+ XCOMM -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
+ XCOMM -- XmbufCreateBuffers).
+ XCOMM -- NOTE_8: HP-UX machines need to comment this out.
+-XCOMM XA_MULTIBUF = -DXMBUF
++XA_MULTIBUF = -DXMBUF
+ XCOMM
+ XCOMM ###########
+ XCOMM
+@@ -470,7 +470,7 @@
+
+ PROGRAMS = $(XANIM)
+
+-INCLUDES = -I$(INCDIR) $(XA_INCS)
++INCLUDES = -I$(INCDIR)/X11 $(XA_INCS)
+
+ LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm
+ DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB)
More information about the svn-ports-all
mailing list