Re: unneeded var breaks build in xenocara/driver/xf86-video-mach64
Matthias Kilian: > I've > > #define TV_OUT 1 > > in /usr/xobj/driver/xf86-video-mach64/config.h, and my build log shows > > checking whether to include TV Out support... yes > > for xf86-video-mach64. It turns out TV_OUT is defined on i386, but not on amd64. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: unneeded var breaks build in xenocara/driver/xf86-video-mach64
Hi, On Wed, May 27, 2015 at 08:56:01PM +0200, Matthias Kilian wrote: > I just ran into the same problem, with the trees updated this > afternoon. > > > > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c: In function > > > 'ATIPreInit': > > > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c:703: error: > > > 'pInt10Info' undeclared (first use in this function) > > > > That is only reached if TV_OUT is defined... but TV_OUT is *not* > > defined in the build. > > I've > > #define TV_OUT 1 > > in /usr/xobj/driver/xf86-video-mach64/config.h, and my build log shows > > checking whether to include TV Out support... yes > > for xf86-video-mach64. Neither the OP nor me mentioned that it happens specifically on i386. Looks like TV Out is automagically enabled for i386. From /usr/xenocara/driver/xf86-video-mach64/configure.ac: ATIMISC_CPIO=no ATIMISC_DGA=yes ATIMISC_TV_OUT=no case $host_cpu in i*86) ATIMISC_TV_OUT=yes ATIMISC_CPIO=yes ;; x86_64|amd64|alpha|ia64) ATIMISC_CPIO=yes ;; sparc) ATIMISC_DGA=no ;; *) ;; esac I'll give this a try Index: configure.ac === RCS file: /cvs/xenocara/driver/xf86-video-mach64/configure.ac,v retrieving revision 1.6 diff -u -p -r1.6 configure.ac --- configure.ac23 May 2015 15:26:41 - 1.6 +++ configure.ac27 May 2015 19:22:15 - @@ -126,7 +126,6 @@ ATIMISC_TV_OUT=no case $host_cpu in i*86) -ATIMISC_TV_OUT=yes ATIMISC_CPIO=yes ;; x86_64|amd64|alpha|ia64) Ciao, Kili
Re: unneeded var breaks build in xenocara/driver/xf86-video-mach64
On Wed, May 27, 2015 at 08:56:01PM +0200, Matthias Kilian wrote: > Hi, > > On Wed, May 27, 2015 at 04:55:39PM +, Christian Weisgerber wrote: > > > someone will hit this soon enough if they haven't already, but building > > > xerocara after recent import gave the following error: > > > > What's "recent"? > > "Update to xf86-video-mach64 6.9.5" was four days ago and I've built > > xenocara since then without any problems. > > I just ran into the same problem, with the trees updated this > afternoon. > > > > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c: In function > > > 'ATIPreInit': > > > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c:703: error: > > > 'pInt10Info' undeclared (first use in this function) > > > > That is only reached if TV_OUT is defined... but TV_OUT is *not* > > defined in the build. > > I've > > #define TV_OUT 1 > > in /usr/xobj/driver/xf86-video-mach64/config.h, and my build log shows > > checking whether to include TV Out support... yes > > for xf86-video-mach64. > > Full build log at https://openbsd.dead-parrot.de/build.log, and > config.log at https://openbsd.dead-parrot.de/config.log. > > Ciao, > Kili > > ps: yes, /usr/xobj completely wiped out before the build. > None of you cared to mention the important bit : $MACHINE... it only shows up on i386 (where configure defines TV_OUT) and it was caused by a bad merge of local changes I had to do to an earlier version of the driver. Fix committed a few minutes ago. Sorry for the trouble. -- Matthieu Herrb
Re: unneeded var breaks build in xenocara/driver/xf86-video-mach64
Hi, On Wed, May 27, 2015 at 04:55:39PM +, Christian Weisgerber wrote: > > someone will hit this soon enough if they haven't already, but building > > xerocara after recent import gave the following error: > > What's "recent"? > "Update to xf86-video-mach64 6.9.5" was four days ago and I've built > xenocara since then without any problems. I just ran into the same problem, with the trees updated this afternoon. > > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c: In function > > 'ATIPreInit': > > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c:703: error: > > 'pInt10Info' undeclared (first use in this function) > > That is only reached if TV_OUT is defined... but TV_OUT is *not* > defined in the build. I've #define TV_OUT 1 in /usr/xobj/driver/xf86-video-mach64/config.h, and my build log shows checking whether to include TV Out support... yes for xf86-video-mach64. Full build log at https://openbsd.dead-parrot.de/build.log, and config.log at https://openbsd.dead-parrot.de/config.log. Ciao, Kili ps: yes, /usr/xobj completely wiped out before the build.
Re: unneeded var breaks build in xenocara/driver/xf86-video-mach64
Same here. make build finished w/o any issues...that was 7 hours ago. On Wed, May 27, 2015 at 04:55:39PM +, Christian Weisgerber wrote: > On 2015-05-27, dan mclaughlin wrote: > > > someone will hit this soon enough if they haven't already, but building > > xerocara after recent import gave the following error: > > What's "recent"? > "Update to xf86-video-mach64 6.9.5" was four days ago and I've built > xenocara since then without any problems. > > > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c: In function > > 'ATIPreInit': > > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c:703: error: > > 'pInt10Info' undeclared (first use in this function) > > That is only reached if TV_OUT is defined... but TV_OUT is *not* > defined in the build. > > -- > Christian "naddy" Weisgerber na...@mips.inka.de > -- Mark Patruck ( mark at wrapped.cx ) GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74 F644 0D3C F66F F286 5E51 http://www.wrapped.cx
Re: unneeded var breaks build in xenocara/driver/xf86-video-mach64
On 2015-05-27, dan mclaughlin wrote: > someone will hit this soon enough if they haven't already, but building > xerocara after recent import gave the following error: What's "recent"? "Update to xf86-video-mach64 6.9.5" was four days ago and I've built xenocara since then without any problems. > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c: In function > 'ATIPreInit': > /usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c:703: error: > 'pInt10Info' undeclared (first use in this function) That is only reached if TV_OUT is defined... but TV_OUT is *not* defined in the build. -- Christian "naddy" Weisgerber na...@mips.inka.de
unneeded var breaks build in xenocara/driver/xf86-video-mach64
someone will hit this soon enough if they haven't already, but building
xerocara after recent import gave the following error:
/usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c: In function
'ATIPreInit':
/usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c:703: error:
'pInt10Info' undeclared (first use in this function)
/usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c:703: error: (Each
undeclared identifier is reported only once
/usr/xenocara/driver/xf86-video-mach64/src/atipreinit.c:703: error: for each
function it appears in.)
*** Error 1 in driver/xf86-video-mach64/obj/src (Makefile:543 'atipreinit.lo')
*** Error 1 in driver/xf86-video-mach64/obj (Makefile:409 'install-recursive')
*** Error 1 in driver/xf86-video-mach64 (/usr/X11R6/share/mk/bsd.xorg.mk:196
'realinstall')
*** Error 1 in driver (:48 'realinstall')
*** Error 1 in . (:48 'realinstall')
*** Error 1 in /usr/xenocara (Makefile:116 'release-install')
pInt10Info is only in xenocara/driver/xf86-video-mach64/src/atipreinit.c,
and nowhere else in the tree.
if (pVBE && !(flags & PROBE_DETECT))
{
xf86Int10InfoPtr pInt10Info = pVBE->pInt10;
/* Validate, then make a private copy of, the initialised BIOS */
CARD8 *pBIOS = xf86int10Addr(pInt10Info, pInt10Info->BIOSseg << 4);
pInt10Info = NULL;
the last one doesn't seem to serve a purpose given that it is only used as
above to call a function. actually it doesn't look like that variable is
really needed at all.
i don't know what upstream is thinking, maybe a dev is already in contact,
so i'm not sure if i should even propose a diff at this point, but for
myself i just removed the last line.
--- driver/xf86-video-mach64/src/atipreinit.c.orig Tue May 26 08:45:39 2015
+++ driver/xf86-video-mach64/src/atipreinit.c Wed May 27 04:12:32 2015
@@ -700,7 +700,6 @@ ATIPreInit
#else
pATI->pVBE = pVBE;
pVBE = NULL;
-pInt10Info = NULL;
#endif /* TV_OUT */
if (ConfiguredMonitor && !(flags & PROBE_DETECT))
