Date: Thu, 19 Feb 2009 14:34:41 -0500 From: Jung-uk Kim <jkim@FreeBSD.org> To: freebsd-x11@FreeBSD.org, freebsd-multimedia@FreeBSD.org Cc: Ewald Jenisch <a@jenisch.at>, lwhsu@freebsd.org Subject: Re: xorg-server fails to build (Stop in xorg-server-1.5.3/glx) Message-ID: <200902191434.44104.jkim@FreeBSD.org> In-Reply-To: <200902191342.04300.jkim@FreeBSD.org> References: <20090217142032.GA4959@aurora.oekb.co.at> <20090219180324.GB4973@aurora.oekb.co.at> <200902191342.04300.jkim@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_URbnJrhJwZI/6Mz Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline [Sorry for crossposting but multimedia@ is more correct ML.] On Thursday 19 February 2009 01:41 pm, Jung-uk Kim wrote: > Can you try the attached patch instead? It is also available from: > > http://people.freebsd.org/~jkim/gpac-libgpac.diff I found the attachment was stripped off. :-( Anyway, I will commit the attached patch soon and close the following PRs if everyone is okay with it: http://www.freebsd.org/cgi/query-pr.cgi?pr=131713 http://www.freebsd.org/cgi/query-pr.cgi?pr=131789 Again, the patch is also available from: http://people.freebsd.org/~jkim/gpac-libgpac-v2.diff Thanks, Jung-uk Kim --Boundary-00=_URbnJrhJwZI/6Mz Content-Type: text/plain; charset="iso-8859-1"; name="gpac-libgpac-v2.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gpac-libgpac-v2.diff" --- multimedia/gpac-libgpac/Makefile 14 Feb 2009 01:55:45 -0000 1.15 +++ multimedia/gpac-libgpac/Makefile 19 Feb 2009 19:11:10 -0000 @@ -18,6 +18,7 @@ WRKSRC= ${WRKDIR}/gpac ALL_TARGET= lib +USE_GL= gl glu USE_GMAKE= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes @@ -26,9 +27,9 @@ INSTALL_WRKSRC= ${WRKSRC}/bin/gcc LIBVER= 1 -CONFIGURE_ARGS= --cc="${CC}" \ - --extra-cflags="${CFLAGS} ${PTHREAD_CFLAGS} -fPIC" \ - --extra-ldflags="${LDFLAGS} ${PTHREAD_LIBS}" +CONFIGURE_ARGS= --cc="${CC}" --X11-path="${X11BASE}" \ + --extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" +CONFIGURE_ENV+= LIBVER="${LIBVER}" PTHREAD_LIBS="${PTHREAD_LIBS}" post-patch: ${CHMOD} +x ${WRKSRC}/configure --- multimedia/gpac-libgpac/files/patch-configure 1 Jan 1970 00:00:00 -0000 +++ multimedia/gpac-libgpac/files/patch-configure 19 Feb 2009 19:11:10 -0000 @@ -0,0 +1,66 @@ +--- configure.orig 2008-12-02 13:04:42.000000000 -0500 ++++ configure 2009-02-19 14:03:34.000000000 -0500 +@@ -33,6 +33,7 @@ + make="make" + strip="strip" + cpu=`uname -m` ++targetos=`uname -s` + debuginfo="no" + sdl_path="" + sdl_local="no" +@@ -222,7 +223,9 @@ + if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then + if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then + cpu="x86_64" +- libdir="lib64" ++ if [ x"$targetos" != x"FreeBSD" ]; then ++ libdir="lib64" ++ fi + #that's a bit crude... + PIC_CFLAGS="-fPIC -DPIC" + want_pic="yes" +@@ -280,7 +283,6 @@ + source_path="`cd \"$source_path\"; pwd`" + fi + # OS specific +-targetos=`uname -s` + case $targetos in + BeOS) + js_flags=-DXP_BEOS +@@ -317,8 +319,8 @@ + FreeBSD) + make="gmake" + LDFLAGS="$LDFLAGS -export-dynamic" +-CFLAGS="$CFLAGS -pthread" +-GPAC_SH_FLAGS=-pthread ++DYN_LIB_SUFFIX="so.$LIBVER" ++GPAC_SH_FLAGS="$PTHREAD_LIBS" + freebsd="yes" + js_flags="-DXP_UNIX -I/usr/include/js" + ;; +@@ -1111,6 +1113,8 @@ + LINK3D="-lopengl32 -lglu32" + elif test "$darwin" = "yes" ; then + LINK3D="-lgl -lglu" ++ elif test "$freebsd" = "yes" ; then ++ LINK3D="-lGL -lGLU" + else + LINK3D="-lGL -lglut" + fi +@@ -1673,7 +1677,7 @@ + echo "USE_X11_XV=$has_x11_xv" >> config.mak + fi + +-if test "$is_64" = "yes"; then ++if test "$is_64" = "yes" -a "$freebsd" = "no" ; then + echo "X11_LIB_PATH=$X11_PATH/lib64" >> config.mak + else + echo "X11_LIB_PATH=$X11_PATH/lib" >> config.mak +@@ -1805,6 +1809,6 @@ + fi + + echo '%.opic : %.c' >> config.mak +-echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) -c $< -o $@' >> config.mak ++echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) $(OGL_INCLS) -c $< -o $@' >> config.mak + + echo "Done - type 'make help' for make info, 'make' to build" --- multimedia/gpac-libgpac/files/patch-src_Makefile 9 Aug 2006 15:10:26 -0000 1.2 +++ multimedia/gpac-libgpac/files/patch-src_Makefile 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ ---- src/Makefile.orig Tue Jul 11 11:53:44 2006 -+++ src/Makefile Wed Aug 9 09:57:59 2006 -@@ -35,6 +35,7 @@ - ifeq ($(DISABLE_SVG), no) - LIBGPAC_SCENE+=scenegraph/svg_attributes.o scenegraph/svg_nodes.o scenegraph/svg_tools.o scenegraph/svg_types.o scenegraph/svg_smjs.o scenegraph/smil_anim.o scenegraph/smil_timing.o scenegraph/svg_properties.o - endif -+EXTRALIBS+=-Wl,-soname,$(LIB) - - - ## libgpac objects gathering: src/mcrypt -@@ -137,7 +138,7 @@ - - - ##libgpac library output --LIB=libgpac.$(DYN_LIB_SUFFIX) -+LIB=libgpac.$(DYN_LIB_SUFFIX).1 - ifeq ($(CONFIG_WIN32),yes) - #LDFLAGS+=-export-symbols libgpac.def - else --Boundary-00=_URbnJrhJwZI/6Mz--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902191434.44104.jkim>