wok-next rev 20666

Up freeglut (3.0.0)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri May 11 03:09:34 2018 +0300 (2018-05-11)
parents 2429f6beff21
children f4db0f796bc3
files freeglut/receipt freeglut/stuff/patches/2.6.0-GFX_radeon.patch freeglut/stuff/patches/series
line diff
     1.1 --- a/freeglut/receipt	Thu May 10 23:23:12 2018 +0300
     1.2 +++ b/freeglut/receipt	Fri May 11 03:09:34 2018 +0300
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="freeglut"
     1.7 -VERSION="2.6.0"
     1.8 +VERSION="3.0.0"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="OpenGL utility toolkit"
    1.11  MAINTAINER="b1+slitaz@nagel.org"
    1.12 @@ -11,38 +11,34 @@
    1.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.14  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.15  
    1.16 -BUILD_DEPENDS="mesa-dev mesa glu-dev glu xorg-inputproto \
    1.17 -xorg-xproto xorg-libX11-dev xorg-libXau-dev xorg-libXdamage-dev \
    1.18 -xorg-libXdmcp-dev xorg-libXext-dev xorg-libXi-dev xorg-libXfixes-dev \
    1.19 -xorg-libXxf86vm-dev xorg-libxcb-dev expat-dev xorg-libxshmfence-dev"
    1.20 +BUILD_DEPENDS="cmake mesa-dev glu-dev xorg-libXi-dev"
    1.21  SPLIT="freeglut-dev"
    1.22  
    1.23  compile_rules() {
    1.24 -	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
    1.25 -	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
    1.26 +	mkdir build
    1.27 +	cd    build
    1.28 +	cmake \
    1.29 +		-DCMAKE_BUILD_TYPE=Release \
    1.30 +		-DCMAKE_INSTALL_PREFIX=/usr \
    1.31 +		-DCMAKE_INSTALL_LIBDIR=lib \
    1.32 +		.. &&
    1.33 +	make &&
    1.34 +	make install || return 1
    1.35  
    1.36 -	if [ ! -d $src ]; then mv $PACKAGE-2.6.0 $src; fi
    1.37 -
    1.38 -	cd $src
    1.39 -
    1.40 -	./configure $CONFIGURE_ARGS &&
    1.41 -#	sed -i '/XF86VMODE/d' config.status
    1.42 -	fix libtool &&
    1.43 -	make &&
    1.44 -	make DESTDIR=$DESTDIR install
    1.45 +	chmod 644 $src/doc/*
    1.46 +	cook_pick_docs $src/doc/*
    1.47  }
    1.48  
    1.49  genpkg_rules() {
    1.50  	case $PACKAGE in
    1.51  		freeglut)
    1.52  			copy @std
    1.53 -			DEPENDS="glibc-base libdrm mesa glu \
    1.54 -			xorg-libX11 xorg-libXau xorg-libXdamage xorg-libXdmcp \
    1.55 -			xorg-libXext xorg-libXi xorg-libXfixes xorg-libXxf86vm"
    1.56 -			SUGGESTED="nvidia"
    1.57 +			DEPENDS="mesa xorg-libX11 xorg-libXi xorg-libXxf86vm"
    1.58  			;;
    1.59  		*-dev)
    1.60  			copy @dev
    1.61 +			DEPENDS="freeglut mesa-dev xorg-libX11-dev xorg-libXrandr-dev \
    1.62 +			xorg-libXxf86vm-dev"
    1.63  			;;
    1.64  	esac
    1.65  }
     2.1 --- a/freeglut/stuff/patches/2.6.0-GFX_radeon.patch	Thu May 10 23:23:12 2018 +0300
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,28 +0,0 @@
     2.4 -Index: src/freeglut_window.c
     2.5 -===================================================================
     2.6 ---- src/freeglut_window.c	(Revision 832)
     2.7 -+++ src/freeglut_window.c	(Arbeitskopie)
     2.8 -@@ -594,10 +594,9 @@
     2.9 - #if TARGET_HOST_POSIX_X11
    2.10 -     if ( window )
    2.11 -     {
    2.12 --        glXMakeContextCurrent(
    2.13 -+        glXMakeCurrent(
    2.14 -             fgDisplay.Display,
    2.15 -             window->Window.Handle,
    2.16 --            window->Window.Handle,
    2.17 -             window->Window.Context
    2.18 -         );
    2.19 - 
    2.20 -@@ -932,10 +932,9 @@
    2.21 -     XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
    2.22 -                      &fgDisplay.DeleteWindow, 1 );
    2.23 - 
    2.24 --    glXMakeContextCurrent(
    2.25 -+    glXMakeCurrent(
    2.26 -         fgDisplay.Display,
    2.27 -         window->Window.Handle,
    2.28 --        window->Window.Handle,
    2.29 -         window->Window.Context
    2.30 -     );
    2.31 - 
     3.1 --- a/freeglut/stuff/patches/series	Thu May 10 23:23:12 2018 +0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,3 +0,0 @@
     3.4 -# fixes an issue with the radeon[hd] ATI opensource drivers
     3.5 -# ref: http://bugs.gentoo.org/show_bug.cgi?id=295163
     3.6 --p0|2.6.0-GFX_radeon.patch