FreeBSD Bugzilla – Attachment 18993 Details for
Bug 33894
update-port: graphics/xawtv
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 7.39 KB, created by
Oliver Lehmann
on 2002-01-14 20:20:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Oliver Lehmann
Created:
2002-01-14 20:20:01 UTC
Size:
7.39 KB
patch
obsolete
>diff -ruN xawtv.old/Makefile /usr/ports/graphics/xawtv/Makefile >--- xawtv.old/Makefile Mon Dec 10 15:07:10 2001 >+++ /usr/ports/graphics/xawtv/Makefile Mon Jan 14 21:11:07 2002 >@@ -6,38 +6,48 @@ > # > > PORTNAME= xawtv >-PORTVERSION= 3.37 >+PORTVERSION= 3.67 > CATEGORIES= graphics >-MASTER_SITES= http://www.strusel007.de/linux/xawtv/ >+MASTER_SITES= http://bytesex.org/xawtv/ > DISTNAME= ${PORTNAME}_${PORTVERSION} >+WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} > >-MAINTAINER= greid@ukug.uk.freebsd.org >+MAINTAINER= lehmann@ans-netz.de > > LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ > png.5:${PORTSDIR}/graphics/png \ > jpeg.9:${PORTSDIR}/graphics/jpeg > >-WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} >+CONFIGURE_ARGS= --prefix=${PREFIX} > >-GNU_CONFIGURE= yes > >+GNU_CONFIGURE= yes >+USE_GMAKE= yes > USE_X_PREFIX= yes > >-SEDFILES= . font i2c man src radio contrib/cc webcam oldstuff/vtx \ >+ >+FILES_CFLAGS= . font i2c man src radio webcam oldstuff/vtx \ > libng libvbi http >+FILES_X11BASE= configure Make.config.in > >-MAN1= alevtd.1 fbtv.1 propwatch.1 rootv.1 showriff.1 v4l-conf.1 \ >- v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1 > >-post-configure: >-.for M in ${SEDFILES} >- @(${SED} -e 's,^CFLAGS=,CFLAGS+=,g' ${WRKSRC}/$M/Makefile | \ >- ${SED} -e 's,-O2,,g' > ${WRKSRC}/foo && ${MV} ${WRKSRC}/foo ${WRKSRC}/$M/Makefile) >+MAN1= alevtd.1 dump-mixers.1 fbtv.1 motv.1 ntsc-cc.1 propwatch.1 record.1 \ >+ rootv.1 scantv.1 showriff.1 \ >+ streamer.1 subtitles.1 ttv.1 v4lctl.1 \ >+ webcam.1 xawtv-remote.1 xawtv.1 >+MAN5= xawtvrc.5 >+MAN8= v4l-conf.8 >+ >+PLIST_SUB+= X11PREFIX=${X11BASE} >+ >+post-patch: >+.for i in ${FILES_X11BASE} >+ ${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/$i > .endfor > >-post-install: >-.for F in led-koi8.pcf led-latin1.pcf led-latin2.pcf >- @gzip ${PREFIX}/lib/X11/fonts/misc/$F >+post-configure: >+.for i in ${FILES_CFLAGS} >+ ${PERL} -pi -e "s|^CFLAGS=|CFLAGS+=|g" ${WRKSRC}/$i/Makefile > .endfor > > .include <bsd.port.mk> >diff -ruN xawtv.old/distinfo /usr/ports/graphics/xawtv/distinfo >--- xawtv.old/distinfo Mon Dec 10 15:07:10 2001 >+++ /usr/ports/graphics/xawtv/distinfo Mon Jan 14 21:10:36 2002 >@@ -1 +1 @@ >-MD5 (xawtv_3.37.tar.gz) = a264eddc95fa92b83b14be386abc7be8 >+MD5 (xawtv_3.67.tar.gz) = bbef18a0b69310d0c3e3c84925d54cd4 >diff -ruN xawtv.old/files/patch-configure /usr/ports/graphics/xawtv/files/patch-configure >--- xawtv.old/files/patch-configure Thu Jan 1 01:00:00 1970 >+++ /usr/ports/graphics/xawtv/files/patch-configure Mon Jan 14 20:36:07 2002 >@@ -0,0 +1,24 @@ >+--- configure.orig Mon Jan 14 20:33:50 2002 >++++ configure Mon Jan 14 20:35:51 2002 >+@@ -2914,19 +2914,13 @@ >+ >+ echo $ac_n "checking for X11 config directory""... $ac_c" 1>&6 >+ echo "configure:2917: checking for X11 config directory" >&5 >+-x11conf=/usr/X11R6/lib/X11 >+-if test -d /etc/X11; then >+- x11conf=/etc/X11 >+-fi >++x11conf=%%X11BASE%%/lib/X11 >+ echo "$ac_t""$x11conf" 1>&6 >+ >+ >+ echo $ac_n "checking for X11 app-defaults directory""... $ac_c" 1>&6 >+ echo "configure:2926: checking for X11 app-defaults directory" >&5 >+-resdir=/usr/X11R6/lib/X11 >+-if test -d /etc/X11/app-defaults; then >+- resdir=/etc/X11 >+-fi >++resdir=%%X11BASE%%/lib/X11 >+ echo "$ac_t""$resdir/app-defaults" 1>&6 >+ >+ >diff -ruN xawtv.old/files/patch-font::Makefile.in /usr/ports/graphics/xawtv/files/patch-font::Makefile.in >--- xawtv.old/files/patch-font::Makefile.in Mon Dec 10 15:07:10 2001 >+++ /usr/ports/graphics/xawtv/files/patch-font::Makefile.in Mon Jan 14 20:33:08 2002 >@@ -1,9 +1,10 @@ >---- font/Makefile.in.orig Sat Mar 3 22:50:32 2001 >-+++ font/Makefile.in Sat Mar 3 22:50:44 2001 >-@@ -16,7 +16,6 @@ >+--- font/Makefile.in.orig Sun Sep 2 12:01:30 2001 >++++ font/Makefile.in Sun Sep 2 12:01:45 2001 >+@@ -23,7 +23,6 @@ > done >- if test "$(ROOT)" = ""; then \ >- (cd $(FONTDIR); mkfontdir); \ >-- xset fp rehash; \ >- true; \ >+ if test "$(DESTDIR)" = ""; then \ >+ (cd $(fontdir); mkfontdir); \ >+- xset fp rehash || true; \ > fi >+ >+ >diff -ruN xawtv.old/files/patch-src::Makefile.in /usr/ports/graphics/xawtv/files/patch-src::Makefile.in >--- xawtv.old/files/patch-src::Makefile.in Thu Jan 1 01:00:00 1970 >+++ /usr/ports/graphics/xawtv/files/patch-src::Makefile.in Mon Jan 14 20:38:31 2002 >@@ -0,0 +1,19 @@ >+--- src/Makefile.in.orig Thu Dec 13 13:15:07 2001 >++++ src/Makefile.in Mon Jan 14 20:36:59 2002 >+@@ -124,12 +124,14 @@ >+ install-dirs: >+ $(INSTALL_DIR) $(bindir) >+ $(INSTALL_DIR) $(resdir)/app-defaults >+- $(INSTALL_DIR) $(resdir)/de/app-defaults >++ for lang in $(LANG); do \ >++ $(INSTALL_DIR) $(resdir)/$$lang/app-defaults;\ >++ done >+ >+ install-common: >+ $(INSTALL_DIR) $(bindir) >+ $(INSTALL_DIR) $(resdir)/app-defaults >+- $(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir) >++ $(INSTALL_DATA) -m 555 $(srcdir)/subtitles $(bindir) >+ $(INSTALL_PROGRAM) -s xawtv-remote $(bindir) >+ $(INSTALL_PROGRAM) -s streamer $(bindir) >+ $(INSTALL_PROGRAM) -s v4lctl $(bindir) >diff -ruN xawtv.old/files/patch-src::motif.c /usr/ports/graphics/xawtv/files/patch-src::motif.c >--- xawtv.old/files/patch-src::motif.c Thu Jan 1 01:00:00 1970 >+++ /usr/ports/graphics/xawtv/files/patch-src::motif.c Mon Jan 14 20:36:39 2002 >@@ -0,0 +1,23 @@ >+--- src/motif.c.orig Mon Sep 17 00:42:53 2001 >++++ src/motif.c Mon Sep 17 00:45:40 2001 >+@@ -24,6 +24,19 @@ >+ # include <sys/soundcard.h> >+ #endif >+ >++#if defined(__FreeBSD__) >++typedef struct mixer_info >++{ >++ char id[16]; >++ char name[32]; >++ int modify_counter; >++ int fillers[10]; >++} mixer_info; >++ >++ >++# define SOUND_MIXER_INFO _IOR ('M', 101, mixer_info) >++#endif >++ >+ #include <X11/Xlib.h> >+ #include <X11/Intrinsic.h> >+ #include <Xm/Xm.h> >+ >diff -ruN xawtv.old/files/patch-src::xt.c /usr/ports/graphics/xawtv/files/patch-src::xt.c >--- xawtv.old/files/patch-src::xt.c Thu Jan 1 01:00:00 1970 >+++ /usr/ports/graphics/xawtv/files/patch-src::xt.c Mon Jan 14 20:36:43 2002 >@@ -0,0 +1,17 @@ >+--- src/xt.c.orig Mon Sep 17 00:39:58 2001 >++++ src/xt.c Mon Sep 17 00:40:07 2001 >+@@ -27,6 +27,13 @@ >+ # include <linux/videodev.h> >+ #endif >+ >++#if defined(__FreeBSD__) >++#define VIDEO_SOUND_MONO 1 >++#define VIDEO_SOUND_STEREO 2 >++#define VIDEO_SOUND_LANG1 4 >++#define VIDEO_SOUND_LANG2 8 >++#endif >++ >+ #include "config.h" >+ >+ #include <X11/Xlib.h> >+ >diff -ruN xawtv.old/pkg-descr /usr/ports/graphics/xawtv/pkg-descr >--- xawtv.old/pkg-descr Mon Dec 10 15:07:10 2001 >+++ /usr/ports/graphics/xawtv/pkg-descr Mon Jan 14 21:14:09 2002 >@@ -1,7 +1,5 @@ > This is a _simple_ xaw-based TV Program which uses the bttv driver or > video4linux (included in 2.1.x). Copy Policy is GNU GPL. > >-WWW: http://www.strusel007.de/linux/xawtv/ >+WWW: http://bytesex.org/xawtv/ > >-- George Reid >-greid@ukug.uk.freebsd.org >diff -ruN xawtv.old/pkg-plist /usr/ports/graphics/xawtv/pkg-plist >--- xawtv.old/pkg-plist Mon Dec 10 15:07:10 2001 >+++ /usr/ports/graphics/xawtv/pkg-plist Mon Jan 14 21:08:30 2002 >@@ -1,16 +1,26 @@ > bin/alevtd > bin/dump-mixers >+bin/ntsc-cc > bin/propwatch > bin/record > bin/rootv > bin/scantv > bin/showriff > bin/streamer >+bin/subtitles >+bin/ttv > bin/v4lctl > bin/webcam > bin/xawtv > bin/xawtv-remote >-lib/X11/app-defaults/Xawtv >-lib/X11/fonts/misc/led-koi8.pcf.gz >-lib/X11/fonts/misc/led-latin1.pcf.gz >-lib/X11/fonts/misc/led-latin2.pcf.gz >+@cwd %%X11BASE%% >+lib/X11/app-defaults/MoTV >+lib/X11/fonts/misc/led-iso8859-1.pcf.gz >+lib/X11/fonts/misc/led-iso8859-2.pcf.gz >+lib/X11/fonts/misc/led-koi8-r.pcf.gz >+lib/X11/de/app-defaults/MoTV >+lib/X11/it/app-defaults/MoTV >+@dirrm lib/X11/de/app-defaults >+@dirrm lib/X11/de >+@dirrm lib/X11/it/app-defaults >+@dirrm lib/X11/it
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 33894
: 18993