From db68adcd1a3d3cfb846dcbf4c9ee01e07af6a3fd Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Tue, 9 Dec 2003 00:01:39 +0000 Subject: [PATCH] - Enable xf86dga - Get rid of libtool archives - Bump portrevision PR: ports/52380 Submitted by: Pedro F. Giffuni --- graphics/libggi/Makefile | 11 +- graphics/libggi/files/patch-configure.in | 174 ++++++++++++++++++ .../files/patch-display-xf86dga-XF86VMode.c | 13 ++ graphics/libggi/files/patch-ltmain.sh | 23 +++ graphics/libggi/pkg-plist | 41 +---- 5 files changed, 226 insertions(+), 36 deletions(-) create mode 100644 graphics/libggi/files/patch-configure.in create mode 100644 graphics/libggi/files/patch-display-xf86dga-XF86VMode.c create mode 100644 graphics/libggi/files/patch-ltmain.sh diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index 51c08f628a2e..d414ad0c988d 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -7,9 +7,10 @@ PORTNAME= libggi PORTVERSION= 2.0.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics devel -MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/v2.0/ \ +MASTER_SITES= ftp://ftp.ggi-project.org/pub/packages/ggi/ggi/v2.0/ \ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ggi DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -23,10 +24,16 @@ USE_BZIP2= yes USE_XLIB= yes INSTALLS_SHLIB= yes +USE_AUTOCONF_VER= 253 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gii=${PREFIX} +CONFIGURE_ARGS= --disable-internal-dga #This is broken for now WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +.ifdef USE_THREADS +CFLAGS+= ${PTHREAD_CFLAGS} +CONFIGURE_ARGS+= --enable-threads +.endif + .if exists(/usr/include/kgi/kgi.h) CONFIGURE_ARGS+= --enable-kgi .endif diff --git a/graphics/libggi/files/patch-configure.in b/graphics/libggi/files/patch-configure.in new file mode 100644 index 000000000000..3576c99046ea --- /dev/null +++ b/graphics/libggi/files/patch-configure.in @@ -0,0 +1,174 @@ +--- configure.in.orig Sun Aug 17 17:28:49 2003 ++++ configure.in Sun Aug 17 17:29:44 2003 +@@ -30,6 +30,11 @@ + dnl Common useable Targets + build_x_target="auto" + build_xlib_target="no" ++build_x_dbe_target="auto" ++build_x_evi_target="auto" ++build_x_shm_target="auto" ++build_x_xf86dga_target="auto" ++build_x_xf86vmode_target="auto" + build_file_target="auto" + build_kgi_target="no" + build_libkgi_target="no" +@@ -276,6 +281,25 @@ + linux/kdev_t.h linux/major.h glide.h glide/glide.h kgimon.h sys/un.h \ + sys/socket.h netinet/in.h netdb.h windows.h ddraw.h vgl.h) + ++ ++dnl ======================================================================== ++dnl Check header files dependencies. ++ ++dnl Disable targets requiring non-existing headers ++if test "x$ac_cv_header_sys_shm_h" != "xyes"; then ++ build_x_shm_target="no" ++ build_ipc_target="no" ++dnl TODO: ++dnl Disable programs/demos/wrap.c here ++fi ++ ++if test "x$ac_cv_header_sys_ipc_h" != "xyes"; then ++ build_ipc_target="no" ++dnl TODO: ++dnl Disable programs/demos/wrap.c here ++fi ++ ++ + dnl ======================================================================== + dnl LibGII must be built + +@@ -349,6 +373,11 @@ + + + dnl ======================================================================== ++dnl Check function dependencies. ++ ++dnl TODO: Disable targets requiring non-existing functions. ++ ++dnl ======================================================================== + dnl Checks whether to compile in various SWARs + + if test "x$do_noswar" = "xyes"; then +@@ -624,15 +653,18 @@ + + + dnl This is necessary as there are plattforms, where +-dnl $ac_x_includes does NOT belong to the default search ++dnl $(ac_)x_includes does NOT belong to the default search + dnl path. Darwin is such a system, for example. +-dnl $ac_x_includes contains the right path to the X ++dnl $(ac_)x_includes contains the right path to the X + dnl includes (/usr/X11R6/include on most systems). + + cflags_old="$CFLAGS" + cppflags_old="$CPPFLAGS" +- CFLAGS="$CFLAGS -I$ac_x_includes" +- CPPFLAGS="$CPPFLAGS -I$ac_x_includes" ++ if test -z "$x_includes" -o "x$x_includes" = "xNONE"; then ++ x_includes="$ac_x_includes" ++ fi ++ CFLAGS="$CFLAGS -I$x_includes" ++ CPPFLAGS="$CPPFLAGS -I$x_includes" + + AC_CHECK_HEADERS(X11/extensions/xf86dga.h \ + X11/extensions/Xdbe.h \ +@@ -642,6 +674,22 @@ + CFLAGS="$cflags_old" + CPPFLAGS="$cppflags_old" + ++ if test "x$ac_cv_header_X11_extensions_Xdbe_h" != "xyes"; then ++ build_x_dbe_target="no" ++ fi ++ if test "x$ac_cv_header_X11_extensions_XEVI_h" != "xyes"; then ++ build_x_evi_target="no" ++ fi ++ if test "x$ac_cv_header_X11_extensions_XShm_h" != "xyes"; then ++ build_x_shm_target="no" ++ fi ++ if test "x$ac_cv_header_X11_extensions_xf86dga_h" != "xyes"; then ++ build_x_xf86dga_target="no" ++ fi ++ if test "x$ac_cv_header_X11_extensions_xf86vmode_h" != "xyes"; then ++ build_x_xf86vmode_target="no" ++ fi ++ + x_helper_xf86dga_libs="" + x_helper_xf86vm_libs="" + +@@ -649,7 +697,7 @@ + x_helper_xf86dga_libs="-lXxf86dga_pic", + AC_CHECK_LIB(Xxf86dga, XF86DGAQueryVersion, + x_helper_xf86dga_libs="-lXxf86dga", +- ac_cv_header_X11_extensions_xf86dga_h=no, ++ build_x_xf86dga_target=no, + [ $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ]), + [ $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ]) + +@@ -657,7 +705,7 @@ + x_helper_xf86vm_libs="-lXxf86vm_pic", + AC_CHECK_LIB(Xxf86vm, XF86VidModeSwitchToMode, + x_helper_xf86vm_libs="-lXxf86vm", +- ac_cv_header_X11_extensions_xf86vmode_h=no, ++ build_x_xf86vmode_target=no, + [ $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ]), + [ $X_LIBS -lXext -lX11 $X_EXTRA_LIBS ]) + fi +@@ -699,8 +747,10 @@ + + if test "x$build_kgi_target" != "xno"; then + AC_TRY_COMPILE([ +-#include "kgi/config.h" +-#include ++#ifndef __FreeBSD__ ++# include "kgi/config.h" ++# include ++#endif + #include + ],[ + kgi_u32_t i; +@@ -827,7 +877,7 @@ + AC_MSG_RESULT(yes) + + AC_MSG_CHECKING(if we should build support for DoubleBuffer extension for x target) +- if test "x$ac_cv_header_X11_extensions_Xdbe_h" != "xyes"; then ++ if test "x$build_x_dbe_target" = "xno"; then + AC_MSG_RESULT(no) + else + XSUBDIRS="$XSUBDIRS dbe" +@@ -835,7 +885,7 @@ + fi + + AC_MSG_CHECKING(if we should build support for Extended Visual Information extension for x target) +- if test "x$ac_cv_header_X11_extensions_XEVI_h" != "xyes"; then ++ if test "x$build_x_evi_target" = "xno"; then + AC_MSG_RESULT(no) + else + XSUBDIRS="$XSUBDIRS evi" +@@ -843,7 +893,7 @@ + fi + + AC_MSG_CHECKING(if we should build support for MIT-SHM extension for x target) +- if test "x$ac_cv_header_X11_extensions_XShm_h" != "xyes"; then ++ if test "x$build_x_shm_target" = "xno"; then + AC_MSG_RESULT(no) + else + XSUBDIRS="$XSUBDIRS shm" +@@ -851,7 +901,7 @@ + fi + + AC_MSG_CHECKING(if we should build support for xf86dga extension for x target) +- if test "x$ac_cv_header_X11_extensions_xf86dga_h" != "xyes"; then ++ if test "x$build_x_xf86dga_target" = "xno"; then + AC_MSG_RESULT(no) + else + XSUBDIRS="$XSUBDIRS dga" +@@ -859,7 +909,7 @@ + fi + + AC_MSG_CHECKING(if we should build support for XF86 Vidmode extension for x target) +- if test "x$ac_cv_header_X11_extensions_xf86vmode_h" != "xyes"; then ++ if test "x$build_x_xf86vmode_target" = "xno"; then + AC_MSG_RESULT(no) + else + XSUBDIRS="$XSUBDIRS vidmode" diff --git a/graphics/libggi/files/patch-display-xf86dga-XF86VMode.c b/graphics/libggi/files/patch-display-xf86dga-XF86VMode.c new file mode 100644 index 000000000000..79a51f583bc1 --- /dev/null +++ b/graphics/libggi/files/patch-display-xf86dga-XF86VMode.c @@ -0,0 +1,13 @@ +--- display/xf86dga/XF86VMode.c.orig Wed Jan 15 09:29:40 2003 ++++ display/xf86dga/XF86VMode.c Tue Dec 9 00:20:08 2003 +@@ -36,6 +36,10 @@ + + /* THIS IS NOT AN X CONSORTIUM STANDARD */ + ++#include ++#include ++#include ++ + #define _POSIX_C_SOURCE 199309L + #if !defined (__OpenBSD__) + #define _POSIX_SOURCE diff --git a/graphics/libggi/files/patch-ltmain.sh b/graphics/libggi/files/patch-ltmain.sh new file mode 100644 index 000000000000..0c9089ac359a --- /dev/null +++ b/graphics/libggi/files/patch-ltmain.sh @@ -0,0 +1,23 @@ +--- ltmain.sh.orig Wed Dec 18 06:19:10 2002 ++++ ltmain.sh Sat Dec 21 02:44:34 2002 +@@ -973,6 +973,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; +@@ -4325,10 +4326,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/graphics/libggi/pkg-plist b/graphics/libggi/pkg-plist index e74b3743af5e..b3f945248d2b 100644 --- a/graphics/libggi/pkg-plist +++ b/graphics/libggi/pkg-plist @@ -45,75 +45,48 @@ include/ggi/internal/plat.h include/ggi/internal/structs.h include/ggi/ll.h include/ggi/types.h -lib/ggi/default/color.la lib/ggi/default/color.so -lib/ggi/default/ilbm.la lib/ggi/default/ilbm.so -lib/ggi/default/iplanar_2p.la lib/ggi/default/iplanar_2p.so -lib/ggi/default/linear_1.la lib/ggi/default/linear_1.so -lib/ggi/default/linear_16.la lib/ggi/default/linear_16.so -lib/ggi/default/linear_1_r.la lib/ggi/default/linear_1_r.so -lib/ggi/default/linear_2.la lib/ggi/default/linear_2.so -lib/ggi/default/linear_24.la lib/ggi/default/linear_24.so -lib/ggi/default/linear_32.la lib/ggi/default/linear_32.so -lib/ggi/default/linear_4.la lib/ggi/default/linear_4.so -lib/ggi/default/linear_4_r.la lib/ggi/default/linear_4_r.so -lib/ggi/default/linear_8.la lib/ggi/default/linear_8.so -lib/ggi/default/planar.la lib/ggi/default/planar.so -lib/ggi/default/stubs.la lib/ggi/default/stubs.so -lib/ggi/default/text_16.la lib/ggi/default/text_16.so -lib/ggi/default/text_32.la lib/ggi/default/text_32.so -lib/ggi/display/X.la lib/ggi/display/X.so -%%WITH_AALIB%%lib/ggi/display/aa.la %%WITH_AALIB%%lib/ggi/display/aa.so -lib/ggi/display/file.la lib/ggi/display/file.so -lib/ggi/display/ipc.la lib/ggi/display/ipc.so -lib/ggi/display/mansync.la lib/ggi/display/mansync.so -lib/ggi/display/memory.la lib/ggi/display/memory.so -lib/ggi/display/monotext.la lib/ggi/display/monotext.so -lib/ggi/display/multi.la lib/ggi/display/multi.so -lib/ggi/display/palemu.la lib/ggi/display/palemu.so -lib/ggi/display/sub.la lib/ggi/display/sub.so -%%WITH_SVGALIB%%lib/ggi/display/svgalib.la %%WITH_SVGALIB%%lib/ggi/display/svgalib.so -lib/ggi/display/tele.la lib/ggi/display/tele.so -lib/ggi/display/terminfo.la lib/ggi/display/terminfo.so -lib/ggi/display/tile.la lib/ggi/display/tile.so -lib/ggi/display/trueemu.la lib/ggi/display/trueemu.so -%%WITH_SVGALIB%%lib/ggi/display/vgagl.la %%WITH_SVGALIB%%lib/ggi/display/vgagl.so -lib/ggi/display/vgl.la lib/ggi/display/vgl.so -lib/libggi.la +lib/ggi/display/xf86dga.so +lib/ggi/helper/helper_x_dbe.so +lib/ggi/helper/helper_x_dga.so +lib/ggi/helper/helper_x_evi.so +lib/ggi/helper/helper_x_shm.so +lib/ggi/helper/helper_x_vidmode.so lib/libggi.so lib/libggi.so.2 @dirrm include/ggi/display +@dirrm lib/ggi/helper @dirrm lib/ggi/display @dirrm lib/ggi/default