Attachment #26687 for bug #45499

View | Details | Raw Unified | Return to bug 45499
Collapse All | Expand All

Lines 6-12 Link Here

(-)/usr/ports/graphics/xawtv/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= xawtv	8	PORTNAME= xawtv
9	PORTVERSION= 3.78	9	PORTVERSION= 3.79
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= http://bytesex.org/xawtv/	11	MASTER_SITES= http://bytesex.org/xawtv/
12	DISTNAME= ${PORTNAME}_${PORTVERSION}	12	DISTNAME= ${PORTNAME}_${PORTVERSION}

Line 1 Link Here

(-)/usr/ports/graphics/xawtv/distinfo (-1 / +1 lines)
1	MD5 (xawtv_3.78.tar.gz) = 12dc344028611e56e69cc7b4c4b2207e	1	MD5 (xawtv_3.79.tar.gz) = 351caf310fd7b9328c2c422304f56d6d




--- Makefile.in.orig	Thu Nov 14 17:07:24 2002
+++ Makefile.in	Tue Nov 19 23:59:02 2002
@@ -65,20 +65,9 @@
 USE_MMX		:= @USE_MMX@
 
 # build final cflags
-CFLAGS	:= @CFLAGS@

-CFLAGS	+= $(LIB_FLAGS)
-CFLAGS	+= -DCONFIGFILE='"$(config)"'
-CFLAGS	+= -DLIBDIR='"$(libdir)"'
-CFLAGS	+= -DDATADIR='"$(datadir)"'
-CFLAGS	+= -DVERSION='"$(VERSION)"'
+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC
 CXXFLAGS = $(CFLAGS)
+CXXFLAGS += $(CFLAGS)
 
-# shared objects need -fPIC
-%.so : CFLAGS += -fPIC
-
 # libraries
 LDLIBS  := @LDLIBS@
 
@@ -131,7 +120,7 @@
 ar_lib		= rm -f $@ && ar -r $@ $^ && ranlib $@
 
 # non-verbose output
-VERBOSE		= no
+VERBOSE		= yes
 ifeq ($(VERBOSE),yes)
 echo_compile_c	= echo $(compile_c)
 echo_compile_cc	= echo $(compile_cc)




--- console/showqt.c.orig	Tue Nov 19 23:49:53 2002
+++ console/showqt.c	Tue Nov 19 23:57:26 2002
@@ -11,6 +11,15 @@
 #include <inttypes.h>
 #include <time.h>
 
+#if !defined(PRId64)
+#define PRId64    "lld"
+#endif
+
+#if !defined(PRIx64)
+#define PRIx64    "llX"
+#endif
+
+
 #if BYTE_ORDER == LITTLE_ENDIAN
 # define SWAP2(x) (((x>>8) & 0x00ff) |\
                    ((x<<8) & 0xff00))

Lines 14-25 Link Here

(-)/usr/ports/graphics/xawtv/pkg-plist (+29 lines)
14	bin/webcam	14	bin/webcam
15	bin/xawtv	15	bin/xawtv
16	bin/xawtv-remote	16	bin/xawtv-remote
		17	lib/xawtv/bilinear.so
17	lib/xawtv/conv-mjpeg.so	18	lib/xawtv/conv-mjpeg.so
		19	lib/xawtv/cubic.so
18	lib/xawtv/drv0-bsd.so	20	lib/xawtv/drv0-bsd.so
19	lib/xawtv/flt-disor.so	21	lib/xawtv/flt-disor.so
20	lib/xawtv/flt-gamma.so	22	lib/xawtv/flt-gamma.so
21	lib/xawtv/flt-invert.so	23	lib/xawtv/flt-invert.so
22	lib/xawtv/flt-smooth.so	24	lib/xawtv/flt-smooth.so
		25	lib/xawtv/linear-blend.so
		26	lib/xawtv/linedoubler.so
23	lib/xawtv/read-avi.so	27	lib/xawtv/read-avi.so
24	lib/xawtv/snd-oss.so	28	lib/xawtv/snd-oss.so
25	lib/xawtv/write-avi.so	29	lib/xawtv/write-avi.so
Lines 42-47 Link Here
42	@dirrm man/es/man5	46	@dirrm man/es/man5
43	@dirrm man/es/man1	47	@dirrm man/es/man1
44	@dirrm man/es	48	@dirrm man/es
		49	share/xawtv/Index.map
		50	share/xawtv/argentina.list
		51	share/xawtv/ccir-h.list
		52	share/xawtv/ccir-i-iii.list
		53	share/xawtv/ccir-sl-sh.list
		54	share/xawtv/europe-east.list
		55	share/xawtv/europe-west.list
		56	share/xawtv/ntsc-bcast-jp.list
		57	share/xawtv/ntsc-bcast.list
		58	share/xawtv/ntsc-cable-ca.list
		59	share/xawtv/ntsc-cable-jp.list
		60	share/xawtv/ntsc-cable.list
		61	share/xawtv/ntsc-hrc.list
		62	share/xawtv/oirt-i-iii.list
		63	share/xawtv/oirt-sl-sh.list
		64	share/xawtv/pal-australia-optus.list
		65	share/xawtv/pal-australia.list
		66	share/xawtv/pal-bcast-cn.list
		67	share/xawtv/pal-bcast-za.list
		68	share/xawtv/pal-ireland.list
		69	share/xawtv/pal-italy.list
		70	share/xawtv/pal-newzealand.list
		71	share/xawtv/secam-france.list
		72	share/xawtv/uhf.list
		73	@dirrm share/xawtv
45	@cwd %%X11BASE%%	74	@cwd %%X11BASE%%
46	lib/X11/app-defaults/MoTV	75	lib/X11/app-defaults/MoTV
47	lib/X11/de/app-defaults/MoTV	76	lib/X11/de/app-defaults/MoTV

Return to bug 45499

Lines 1-7 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-Makefile.in (-8 / +21 lines)
1	--- Makefile.in.orig Mon Sep 9 16:05:39 2002	1	--- Makefile.in.orig Thu Nov 14 17:07:24 2002
2	+++ Makefile.in Wed Oct 30 20:54:40 2002	2	+++ Makefile.in Tue Nov 19 23:59:02 2002
3	@@ -62,15 +62,7 @@	3	@@ -65,20 +65,9 @@
4	FOUND_ZVBI := @FOUND_ZVBI@	4	USE_MMX := @USE_MMX@
5		5
6	# build final cflags	6	# build final cflags
7	-CFLAGS := @CFLAGS@	7	-CFLAGS := @CFLAGS@
Lines 11-20 Link Here
11	-CFLAGS += $(LIB_FLAGS)	11	-CFLAGS += $(LIB_FLAGS)
12	-CFLAGS += -DCONFIGFILE='"$(config)"'	12	-CFLAGS += -DCONFIGFILE='"$(config)"'
13	-CFLAGS += -DLIBDIR='"$(libdir)"'	13	-CFLAGS += -DLIBDIR='"$(libdir)"'
		14	-CFLAGS += -DDATADIR='"$(datadir)"'
14	-CFLAGS += -DVERSION='"$(VERSION)"'	15	-CFLAGS += -DVERSION='"$(VERSION)"'
15	-CXXFLAGS = $(CFLAGS)	16	+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC
16	+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DVERSION='"$(VERSION)"' -fPIC	17	CXXFLAGS = $(CFLAGS)
17	+CXXFLAGS += $(CFLAGS)
18		18
19	# shared objects need -fPIC	19	-# shared objects need -fPIC
20	-%.so : CFLAGS += -fPIC	20	-%.so : CFLAGS += -fPIC
		21	-
		22	# libraries
		23	LDLIBS := @LDLIBS@
		24
		25	@@ -131,7 +120,7 @@
		26	ar_lib = rm -f $@ && ar -r $@ $^ && ranlib $@
		27
		28	# non-verbose output
		29	-VERBOSE = no
		30	+VERBOSE = yes
		31	ifeq ($(VERBOSE),yes)
		32	echo_compile_c = echo $(compile_c)
		33	echo_compile_cc = echo $(compile_cc)

Line 0 Link Here

(-)/usr/ports/graphics/xawtv/files/patch-console::showqt.c (+18 lines)
	1	--- console/showqt.c.orig Tue Nov 19 23:49:53 2002
	2	+++ console/showqt.c Tue Nov 19 23:57:26 2002
	3	@@ -11,6 +11,15 @@
	4	#include <inttypes.h>
	5	#include <time.h>
	6
	7	+#if !defined(PRId64)
	8	+#define PRId64 "lld"
	9	+#endif
	10	+
	11	+#if !defined(PRIx64)
	12	+#define PRIx64 "llX"
	13	+#endif
	14	+
	15	+
	16	#if BYTE_ORDER == LITTLE_ENDIAN
	17	# define SWAP2(x) (((x>>8) & 0x00ff) \|\
	18	((x<<8) & 0xff00))