From doublef-ctm@yandex.ru  Tue Oct 10 08:35:38 2006
Return-Path: <doublef-ctm@yandex.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B02F316A407
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Oct 2006 08:35:38 +0000 (UTC)
	(envelope-from doublef-ctm@yandex.ru)
Received: from smtp1.yandex.ru (smtp1.yandex.ru [213.180.223.87])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D53C743D45
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 10 Oct 2006 08:35:37 +0000 (GMT)
	(envelope-from doublef-ctm@yandex.ru)
Received: from [83.239.189.126] ([83.239.189.126]:23769 "EHLO shark" smtp-auth:
	"doublef-ctm" TLS-CIPHER: <none> TLS-PEER-CN1: <none>)
	by mail.yandex.ru with ESMTP id S2078934AbWJJIfe (ORCPT
	<rfc822;FreeBSD-gnats-submit@freebsd.org>);
	Tue, 10 Oct 2006 12:35:34 +0400
Received: by shark (Postfix, from userid 1000)
	id 46A011741F; Tue, 10 Oct 2006 12:35:31 +0400 (MSD)
Message-Id: <20061010083531.46A011741F@shark>
Date: Tue, 10 Oct 2006 12:35:31 +0400 (MSD)
From: Sergey Zaharchenko <doublef-ctm@yandex.ru>
Reply-To: Sergey Zaharchenko <doublef-ctm@yandex.ru>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] graphics/pixie: builds, but doesn't run
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         104251
>Category:       ports
>Synopsis:       [PATCH] graphics/pixie: builds, but doesn't run
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 10 08:40:18 GMT 2006
>Closed-Date:    Mon Oct 16 05:51:08 GMT 2006
>Last-Modified:  Mon Oct 16 06:00:36 GMT 2006
>Originator:     Sergey Zaharchenko
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
Volgograd State Technical University
>Environment:
System: FreeBSD shark.localdomain 7.0-CURRENT FreeBSD 7.0-CURRENT #4: Thu Sep 14 16:32:04 MSD 2006 root@shark.localdomain:/var/obj/src/usr.src/sys/GENERIC i386

>Description:
	The graphics/pixie port (used by other ports like graphics/makehuman)
	builds and installs, but doesn't work correctly as it's misconfigured
	and a shared library is missing.
>How-To-Repeat:
	Install graphics/pixie and try running rndr. It will complain about
	libcommon.so not being found. If you add it, it will complain about
	not finding `display drivers' named `file', `framebuffer', or
	whatever display you have in the .rib file, and the shaders you have
	in the .rib file.
>Fix:

The following patch installs the `common' shlib and configures pixie so that
rndr can find the shaders, etc. it wants.

diff -ud pixie.orig/Makefile pixie/Makefile
--- pixie.orig/Makefile Sun Sep  3 11:35:51 2006
+++ pixie/Makefile      Tue Oct 10 11:56:10 2006
@@ -28,8 +28,9 @@
                CXXFLAGS="${CXXFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
                LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
                LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/${PORTNAME} --with-shaderdir=${PREFIX}/share/${PORTNAME}/shaders --with-modeldir=${PREFIX}/share/${PORTNAME} --with-texturedir=${PREFIX}/share/${PORTNAME} --with-proceduraldir=${PREFIX}/share/${PORTNAME} --with-displaysdir=${PREFIX}/lib/${PORTNAME}
 USE_LDCONFIG=  yes
-LDCONFIG_DIRS= %%PREFIX%%/lib/${PORTNAME}
+LDCONFIG_DIRS= ${PREFIX}/lib/${PORTNAME}
 WRKSRC=                ${WRKDIR}/Pixie
 
 PIXIE_EXES=    precomp rndr sdrc sdrinfo show texmake
@@ -68,7 +69,7 @@
 # libs
        # avoid conflicts by installing in separate dir
        @${MKDIR} ${PREFIX}/lib/${PORTNAME}
-.for i in sdr ri
+.for i in sdr ri common
        ${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/lib${i}.a \
                ${PREFIX}/lib/${PORTNAME}
        ${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/lib${i}.so.0 \
Common subdirectories: pixie.orig/files and pixie/files
diff -ud pixie.orig/pkg-plist pixie/pkg-plist
--- pixie.orig/pkg-plist        Tue Oct 10 12:09:26 2006
+++ pixie/pkg-plist     Tue Oct 10 11:40:30 2006
@@ -12,6 +12,8 @@
 include/pixie/shadeop.h
 lib/pixie/file.so
 lib/pixie/framebuffer.so
+lib/pixie/libcommon.so
+lib/pixie/libcommon.so.0
 lib/pixie/libri.a
 lib/pixie/libri.so
 lib/pixie/libri.so.0


>Release-Note:
>Audit-Trail:

From: Sergey Zaharchenko <doublef-ctm@yandex.ru>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104251: [PATCH] graphics/pixie: builds, but doesn't run
Date: Wed, 11 Oct 2006 17:20:38 +0400

 + Add a missing static library to pkg-plist so that it gets
   deinstalled correctly.
 
 * Install ldconfig configuration file so that the user doesn't have to
   specify LD_LIBRARY_PATH.
 
 - The pkg-message is not needed.
 
 diff -udr pixie.orig/Makefile pixie/Makefile
 --- pixie.orig/Makefile	Sun Sep  3 11:35:51 2006
 +++ pixie/Makefile	Wed Oct 11 16:56:56 2006
 @@ -28,14 +28,13 @@
  		CXXFLAGS="${CXXFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
  		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
  		LIBS="${PTHREAD_LIBS}"
 -USE_LDCONFIG=	yes
 -LDCONFIG_DIRS=	%%PREFIX%%/lib/${PORTNAME}
 +CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/${PORTNAME} --with-shaderdir=${PREFIX}/share/${PORTNAME}/shaders --with-modeldir=${PREFIX}/share/${PORTNAME} --with-texturedir=${PREFIX}/share/${PORTNAME} --with-proceduraldir=${PREFIX}/share/${PORTNAME} --with-displaysdir=${PREFIX}/lib/${PORTNAME}
 +USE_LDCONFIG=	%%PREFIX%%/lib/${PORTNAME}
  WRKSRC=		${WRKDIR}/Pixie
  
  PIXIE_EXES=	precomp rndr sdrc sdrinfo show texmake
  PIXIE_SHLIBS=	file framebuffer rgbe
  
 -SUB_FILES=	pkg-message
  SUB_LIST+=	PORTNAME=${PORTNAME}
  
  .include <bsd.port.pre.mk>
 @@ -68,7 +67,7 @@
  # libs
  	# avoid conflicts by installing in separate dir
  	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
 -.for i in sdr ri
 +.for i in sdr ri common
  	${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/lib${i}.a \
  		${PREFIX}/lib/${PORTNAME}
  	${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/lib${i}.so.0 \
 @@ -104,8 +103,5 @@
  	${INSTALL_DATA} ${WRKSRC}/doc/${i}/* ${DOCSDIR}/${i}
  .endfor
  .endif
 -
 -post-install:
 -	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.post.mk>
 Only in pixie.orig/files: pkg-message.in
 diff -udr pixie.orig/pkg-plist pixie/pkg-plist
 --- pixie.orig/pkg-plist	Tue Oct 10 12:09:26 2006
 +++ pixie/pkg-plist	Wed Oct 11 16:42:12 2006
 @@ -12,6 +12,9 @@
  include/pixie/shadeop.h
  lib/pixie/file.so
  lib/pixie/framebuffer.so
 +lib/pixie/libcommon.a
 +lib/pixie/libcommon.so
 +lib/pixie/libcommon.so.0
  lib/pixie/libri.a
  lib/pixie/libri.so
  lib/pixie/libri.so.0
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Sun Oct 15 10:26:15 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104251 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Mon Oct 16 05:51:07 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=104251 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/104251: commit references a PR
Date: Mon, 16 Oct 2006 05:51:03 +0000 (UTC)

 itetcu      2006-10-16 05:50:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/pixie       Makefile pkg-plist 
   Removed files:
     graphics/pixie/files pkg-message.in 
   Log:
   - install all needed share libs
   - Add a missing static library to pkg-plist so that it gets
   deinstalled correctly.
   - USE_LDCONFIG so that the user doesn't have to specify LD_LIBRARY_PATH
   and kill the now obsolete  pkg-message.
   
   PR:             ports/104251
   Submitted by:   Sergey Zaharchenko <doublef-ctm@yandex.ru>
   Approved by:    portmgr (clement)
   
   Revision  Changes    Path
   1.28      +3 -7      ports/graphics/pixie/Makefile
   1.2       +0 -5      ports/graphics/pixie/files/pkg-message.in (dead)
   1.7       +3 -0      ports/graphics/pixie/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
