From tmclaugh@sdf.lonestar.org  Mon Jun 14 05:39:54 2004
Return-Path: <tmclaugh@sdf.lonestar.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A5E6F16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 14 Jun 2004 05:39:54 +0000 (GMT)
Received: from straycat.dhs.org (h0050da134090.ne.client2.attbi.com [24.91.148.154])
	by mx1.FreeBSD.org (Postfix) with SMTP id D9B4743D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 14 Jun 2004 05:39:53 +0000 (GMT)
	(envelope-from tmclaugh@sdf.lonestar.org)
Received: (qmail 372 invoked from network); 14 Jun 2004 05:39:53 -0000
Received: from compass.straycat.dhs.org (192.168.1.32)
  by alexandria.straycat.dhs.org with SMTP; 14 Jun 2004 05:39:53 -0000
Message-Id: <1087191593.0@compass.straycat.dhs.org>
Date: Mon, 14 Jun 2004 01:39:53 -0400
From: "Tom McLaughlin" <tmclaugh@sdf.lonestar.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Cc: riggs@rrr.de
Subject: [PATCH] muiltimedia/mplayer: Fails to build when WITH_GTK1 knob not set.
X-Send-Pr-Version: gtk-send-pr 0.3.3 
X-GNATS-Notify:

>Number:         67923
>Category:       ports
>Synopsis:       [PATCH] multimedia/mplayer: Fails to build when WITH_GTK1 knob not set.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 14 05:40:18 GMT 2004
>Closed-Date:    Mon Jun 14 14:48:59 GMT 2004
>Last-Modified:  Mon Jun 14 17:28:53 GMT 2004
>Originator:     Tom McLaughlin
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 5.2-CURRENT #1: Sat Jun 12 22:09:46 EDT 2004
    root@compass.straycat.dhs.org:/usr/obj/usr/src/sys/COMPASS



>Description:


Mplayer fails to build when the WITH_GTK1 knob is not set because the videx 
radeon and rage128 drivers require X11 include files.  The WITH_GTK1 knob 
adds the --enable-gui configure argument which automatically adds their 
location when compiling.  If this is not set then currently the build will fail.  
Attached patch corrects the Makefile for these drivers so that the X11 
includes are always used when compiling them.

This is the same problem reported in PR 67913 but that patch does not fix 
the problem when building with the WITHOUT_GUI knob set.

Maintainer CC'ed on PR.


Port build error output:

cc -c -I../libvo/ -I../../libvo -O -pipe   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/local/include/freetype2 -I/usr/local/include  -fPIC -I. -I.. -o radeon_vid.o radeon_vid.c
radeon_vid.c:29:22: X11/Xlib.h: No such file or directory
radeon_vid.c: In function `probe_fireGL_driver':
radeon_vid.c:925: error: `Display' undeclared (first use in this function)
radeon_vid.c:925: error: (Each undeclared identifier is reported only once
radeon_vid.c:925: error: for each function it appears in.)
radeon_vid.c:925: error: `dp' undeclared (first use in this function)
radeon_vid.c:927: warning: initialization makes pointer from integer without a cast
gmake[2]: *** [radeon_vid.o] Error 1
gmake[2]: Leaving directory `/usr/ports/multimedia/mplayer.old/work/MPlayer-1.0pre4/vidix/drivers'
gmake[1]: *** [all] Error 2
gmake[1]: Leaving directory `/usr/ports/multimedia/mplayer.old/work/MPlayer-1.0pre4/vidix'
gmake: *** [vidix/libvidix.a] Error 2
*** Error code 2



>How-To-Repeat:





>Fix:


--- mplayer_radeon.diff begins here ---
diff -Nur mplayer.orig/files/patch-videx_drivers_Makefile mplayer/files/patch-videx_drivers_Makefile
--- mplayer.orig/files/patch-videx_drivers_Makefile	Wed Dec 31 19:00:00 1969
+++ mplayer/files/patch-videx_drivers_Makefile	Mon Jun 14 01:05:44 2004
@@ -0,0 +1,18 @@
+--- vidix/drivers/Makefile.orig	Wed Oct 22 12:45:33 2003
++++ vidix/drivers/Makefile	Mon Jun 14 01:04:55 2004
+@@ -14,13 +14,13 @@
+ RADEON_SRCS=radeon_vid.c
+ RADEON_OBJS=radeon_vid.o
+ RADEON_LIBS=-L../../libdha -ldha -lm
+-RADEON_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
++RADEON_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
+ 
+ RAGE128_VID=rage128_vid.so
+ RAGE128_SRCS=radeon_vid.c
+ RAGE128_OBJS=rage128_vid.o
+ RAGE128_LIBS=-L../../libdha -ldha
+-RAGE128_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128
++RAGE128_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DRAGE128
+ 
+ PM3_VID=pm3_vid.so
+ PM3_SRCS=pm3_vid.c
--- mplayer_radeon.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-advocacy->freebsd-ports-bugs 
Responsible-Changed-By: pav 
Responsible-Changed-When: Mon Jun 14 08:40:55 GMT 2004 
Responsible-Changed-Why:  
Reclassify 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67923 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon Jun 14 14:48:48 GMT 2004 
State-Changed-Why:  
Fix committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67923 
>Unformatted:
