From owner-freebsd-bugs Wed Jan 2 17:50:35 2002 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1945337B420 for ; Wed, 2 Jan 2002 17:50:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g031o1S12797; Wed, 2 Jan 2002 17:50:01 -0800 (PST) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2EB9637B416 for ; Wed, 2 Jan 2002 17:40:29 -0800 (PST) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g031eTT10244; Wed, 2 Jan 2002 17:40:29 -0800 (PST) (envelope-from nobody) Message-Id: <200201030140.g031eTT10244@freefall.freebsd.org> Date: Wed, 2 Jan 2002 17:40:29 -0800 (PST) From: Siwei Liu To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: i386/33502: xawtv 3.37 can not run on FreeBSD-current Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 33502 >Category: i386 >Synopsis: xawtv 3.37 can not run on FreeBSD-current >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jan 02 17:50:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Siwei Liu >Release: FreeBSD current >Organization: NONE >Environment: FreeBSD-5.0-SNAP(i386) >Description: xawtv is a usefull TV application on FreeBSD. It works fine on my FreeBSD 4.x. But when I update to CURRENT, it couldn't word any more. Even I make a SNAP of FreeBSD-current. >How-To-Repeat: >Fix: Here is my FIX patch: 1. /usr/ports/graphics/xawtv/Makefile: --- Makefile Tue Sep 11 02:22:49 2001 +++ Makefile Thu Jan 3 08:55:07 2002 *************** *** 6,17 **** # PORTNAME= xawtv ! PORTVERSION= 3.37 CATEGORIES= graphics ! MASTER_SITES= http://www.strusel007.de/linux/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} ! MAINTAINER= greid@ukug.uk.freebsd.org LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ png.5:${PORTSDIR}/graphics/png \ --- 6,17 ---- # PORTNAME= xawtv ! PORTVERSION= 3.66 CATEGORIES= graphics ! MASTER_SITES= http://bytesex.org/xawtv/ DISTNAME= ${PORTNAME}_${PORTVERSION} ! MAINTAINER= swliu77@hotmail.com LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ png.5:${PORTSDIR}/graphics/png \ *************** *** 23,43 **** USE_X_PREFIX= yes ! SEDFILES= . font i2c man src radio contrib/cc webcam oldstuff/vtx \ libng libvbi http ! 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) ! .endfor ! ! post-install: ! .for F in led-koi8.pcf led-latin1.pcf led-latin2.pcf ! @gzip ${PREFIX}/lib/X11/fonts/misc/$F ! .endfor .include --- 23,33 ---- USE_X_PREFIX= yes ! SEDFILES= . font i2c man src radio webcam oldstuff/vtx \ libng libvbi http ! MAN1= alevtd.1 fbtv.1 propwatch.1 rootv.1 showriff.1 \ v4lctl.1 webcam.1 xawtv-remote.1 xawtv.1 ! MAN8= v4l-conf.8 .include 2. /usr/ports/graphics/xawtv/distinfo: --- distinfo Tue Mar 20 03:12:55 2001 +++ distinfo Thu Jan 3 08:54:10 2002 *************** *** 1 **** ! MD5 (xawtv_3.37.tar.gz) = a264eddc95fa92b83b14be386abc7be8 --- 1 ---- ! MD5 (xawtv_3.66.tar.gz) = 8783e6ca4530d64e0877c40b8a0bac97 3. /usr/ports/graphics/xawtv/pkg-plist: --- pkg-plist Tue Mar 20 03:12:55 2001 +++ pkg-plist Tue Jan 1 17:26:36 2002 *************** *** 11,16 **** 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 --- 11,16 ---- bin/xawtv bin/xawtv-remote lib/X11/app-defaults/Xawtv ! lib/X11/fonts/misc/led-koi8-r.pcf.gz ! lib/X11/fonts/misc/led-iso8859-1.pcf.gz ! lib/X11/fonts/misc/led-iso8859-2.pcf.gz 4. in its files directory, I make some patch for it: patch-aa: --- font/Makefile.in.orig Fri Aug 24 07:53:20 2001 +++ font/Makefile.in Tue Jan 1 16:54:53 2002 *************** *** 21,27 **** done if test "$(DESTDIR)" = ""; then \ (cd $(fontdir); mkfontdir); \ - xset fp rehash || true; \ fi --- 21,26 ---- patch-ab: --- src/commands.c Tue Dec 11 12:38:38 2001 +++ src/commands.c Tue Jan 1 16:41:16 2002 *************** *** 507,513 **** /* ----------------------------------------------------------------------- */ ! static char* strnstr(char *haystack, char *needle) { int hlen = strlen(haystack); int nlen = strlen(needle); --- 507,513 ---- /* ----------------------------------------------------------------------- */ ! static char* strnstr_my(char *haystack, char *needle) { int hlen = strlen(haystack); int nlen = strlen(needle); *************** *** 551,557 **** /* ... next try substring matches ... */ if (i == count) for (i = 0; i < count; i++) ! if (NULL != strnstr(channels[i]->name,argv[0])) break; /* ... next try using the argument as index ... */ if (i == count) --- 551,557 ---- /* ... next try substring matches ... */ if (i == count) for (i = 0; i < count; i++) ! if (NULL != strnstr_my(channels[i]->name,argv[0])) break; /* ... next try using the argument as index ... */ if (i == count) patch-ac: --- src/Makefile.in Tue Dec 11 15:39:55 2001 +++ src/Makefile.in Tue Jan 1 16:47:41 2002 *************** *** 28,34 **** FBTV_LIBS = $(GFX_LIBS) $(LIRC_LIBS) $(CURSES_LIBS) $(ALSA_LIBS) \ -L@x_libraries@ @FSLIB@ -lm ! TTV_OBJS = aa.o channel-no-x11.o $(COMMON_OBJS) TTV_LIBS = $(GFX_LIBS) $(AA_LIBS) V4LCTL_OBJS = v4lctl.o channel-no-x11.o xv.o $(COMMON_OBJS) --- 28,34 ---- FBTV_LIBS = $(GFX_LIBS) $(LIRC_LIBS) $(CURSES_LIBS) $(ALSA_LIBS) \ -L@x_libraries@ @FSLIB@ -lm ! TTV_OBJS = aa.o channel-no-x11.o -laa $(COMMON_OBJS) TTV_LIBS = $(GFX_LIBS) $(AA_LIBS) V4LCTL_OBJS = v4lctl.o channel-no-x11.o xv.o $(COMMON_OBJS) *************** *** 68,92 **** # build rules xawtv: $(XAWTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(XAWTV_OBJS) $(XAWTV_LIBS) -ldl -Wl,-E motv: $(MOTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(MOTV_OBJS) $(MOTV_LIBS) -ldl -Wl,-E fbtv: $(FBTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(FBTV_OBJS) $(FBTV_LIBS) -ldl -Wl,-E ttv: $(TTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(TTV_OBJS) $(TTV_LIBS) -ldl -Wl,-E v4lctl: $(V4LCTL_OBJS) ! $(CC) $(CFLAGS) -o $@ $(V4LCTL_OBJS) $(V4LCTL_LIBS) -ldl -Wl,-E streamer: $(STREAMER_OBJS) ! $(CC) $(CFLAGS) -o $@ $(STREAMER_OBJS) $(STREAMER_LIBS) -ldl -Wl,-E scantv: $(SCANTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(SCANTV_OBJS) $(SCANTV_LIBS) -ldl -Wl,-E xvideo: xvideo.o $(CC) $(CFLAGS) -o $@ xvideo.o $(ATHENA_LIBS) --- 68,92 ---- # build rules xawtv: $(XAWTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(XAWTV_OBJS) $(XAWTV_LIBS) -Wl,-E motv: $(MOTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(MOTV_OBJS) $(MOTV_LIBS) -Wl,-E fbtv: $(FBTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(FBTV_OBJS) $(FBTV_LIBS) -Wl,-E ttv: $(TTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(TTV_OBJS) $(TTV_LIBS) -Wl,-E v4lctl: $(V4LCTL_OBJS) ! $(CC) $(CFLAGS) -o $@ $(V4LCTL_OBJS) $(V4LCTL_LIBS) -Wl,-E streamer: $(STREAMER_OBJS) ! $(CC) $(CFLAGS) -o $@ $(STREAMER_OBJS) $(STREAMER_LIBS) -Wl,-E scantv: $(SCANTV_OBJS) ! $(CC) $(CFLAGS) -o $@ $(SCANTV_OBJS) $(SCANTV_LIBS) -Wl,-E xvideo: xvideo.o $(CC) $(CFLAGS) -o $@ xvideo.o $(ATHENA_LIBS) *************** *** 129,135 **** install-common: $(INSTALL_DIR) $(bindir) $(INSTALL_DIR) $(resdir)/app-defaults - $(INSTALL_PROGRAM) $(srcdir)/subtitles $(bindir) $(INSTALL_PROGRAM) -s xawtv-remote $(bindir) $(INSTALL_PROGRAM) -s streamer $(bindir) $(INSTALL_PROGRAM) -s v4lctl $(bindir) --- 129,134 ---- patch-ad: --- webcam/Makefile.in Tue Dec 11 13:24:57 2001 +++ webcam/Makefile.in Tue Jan 1 16:45:57 2002 *************** *** 15,21 **** all build: $(PROGS) webcam: $(OBJS) ! $(CC) $(CFLAGS) -o $@ $(OBJS) ../libng/libng.a $(LDLIBS) -ldl -Wl,-E install: all $(INSTALL_DIR) $(bindir) --- 15,21 ---- all build: $(PROGS) webcam: $(OBJS) ! $(CC) $(CFLAGS) -o $@ $(OBJS) ../libng/libng.a $(LDLIBS) -Wl,-E install: all $(INSTALL_DIR) $(bindir) That's All! It works fine on my FreeBSD-current BOX! >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message