wok-stable diff catalyst/receipt @ rev 10737

firefox: keep mesa-dev in bdeps but disable webgl, fix bookmarks and wrong option in mozconfig
author Christophe Lincoln <pankso@slitaz.org>
date Sun May 29 16:54:13 2011 +0200 (2011-05-29)
parents cbfb348cb173
children
line diff
     1.1 --- a/catalyst/receipt	Sun May 08 00:40:27 2011 +0200
     1.2 +++ b/catalyst/receipt	Sun May 29 16:54:13 2011 +0200
     1.3 @@ -6,68 +6,59 @@
     1.4  MAINTAINER="jozee@slitaz.org"
     1.5  SHORT_DESC="AMD/ATI beta drivers (non-free) for Radeon brand cards "
     1.6  WEB_SITE="http://www.ati.amd.com"
     1.7 -DEPENDS="xorg-server mesa mesa-dri libdrm linux-drm fontconfig linux-agp xorg-libSM xorg-libXi xorg-libXcursor"
     1.8 -BUILD_DEPENDS="linux xorg-server linux-module-headers"
     1.9  TARBALL="ati-driver-installer-${VERSION/./-}-x86.x86_64.run"
    1.10  WGET="http://www2.ati.com/drivers/linux/$TARBALL"
    1.11  TAGS="drivers graphic video"
    1.12 +RUN_OPTS="--extract $PACKAGE-$VERSION"
    1.13 +
    1.14 +DEPENDS="xorg-server mesa mesa-dri libdrm linux-drm fontconfig linux-agp \
    1.15 +xorg-libSM xorg-libXi xorg-libXcursor"
    1.16 +BUILD_DEPENDS="linux xorg-server-dev mesa-dev libdrm-dev linux-module-headers"
    1.17  
    1.18  # Rules to configure and make the package.
    1.19 -
    1.20 -compile_rules() {
    1.21 -
    1.22 -	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
    1.23 -   
    1.24 -	cd $WOK/$PACKAGE
    1.25 -	[ -f $SOURCES_REPOSITORY/$TARBALL ] && cp $SOURCES_REPOSITORY/$TARBALL .
    1.26 -	if [ ! -f $TARBALL ]; then
    1.27 -		wget $WGET
    1.28 -		cp $TARBALL $SOURCES_REPOSITORY
    1.29 -	fi
    1.30 -    
    1.31 -	chmod +x $TARBALL
    1.32 -	[ -d $PACKAGE-$VERSION ]  || sh $TARBALL --extract $PACKAGE-$VERSION
    1.33 -	
    1.34 -	for i in autoconf.h utsrelease.h ; do
    1.35 -		grep -rl linux/$i * | xargs sed -i "s|linux/$i|generated/$i|"
    1.36 -	done
    1.37 +compile_rules()
    1.38 +{
    1.39  	cd $src
    1.40 +	#for i in autoconf.h utsrelease.h ; do
    1.41 +		#grep -rl linux/$i * | xargs sed -i "s|linux/$i|generated/$i|"
    1.42 +	#done
    1.43 +	echo "Applying patches..."
    1.44  	patch -Np1 -i $stuff/makefile_compat.patch
    1.45 -	patch -Np1 -i $stuff/$PACKAGE-${KERNEL_VERSION}.patch
    1.46 +	patch -Np1 -i $stuff/$PACKAGE-${kvers}.patch
    1.47  	patch -Np1 -i $stuff/sema_init.patch
    1.48  	cd $src/common/lib/modules/fglrx/build_mod
    1.49  	cp $src/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 . 
    1.50  	cp 2.6.x/Makefile .
    1.51 -	make -C /usr/src/linux SUBDIRS="`pwd`" modules 
    1.52 +	echo "Compiling the Kernel module..."
    1.53 +	make -C /usr/src/linux SUBDIRS=$(pwd) modules 
    1.54  }	
    1.55  
    1.56  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.57  genpkg_rules()
    1.58  {
    1.59 -	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
    1.60 -	EXTRAVERSION=_$KERNEL_VERSION
    1.61 +	EXTRAVERSION=_${kvers}
    1.62  
    1.63 -	mkdir -p  $fs/usr/share/pixmaps \
    1.64 -			  $fs/usr/bin \
    1.65 -			  $fs/usr/lib/xorg/modules \
    1.66 -			  $fs/usr/share/licenses/$PACKAGE \
    1.67 -			  $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video \
    1.68 -			  $fs/etc
    1.69 +	mkdir -p \
    1.70 +		$fs/usr/share/pixmaps \
    1.71 +		$fs/usr/bin \
    1.72 +		$fs/usr/lib/xorg/modules \
    1.73 +		$fs/usr/share/licenses/$PACKAGE \
    1.74 +		$fs/lib/modules/$kvers-slitaz/kernel/drivers/video \
    1.75 +		$fs/etc
    1.76  	
    1.77  	# Compress and install module
    1.78  	lzma e $src/common/lib/modules/fglrx/build_mod/fglrx.ko \
    1.79 -			$fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video/fglrx.ko.gz
    1.80 -	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video/fglrx.ko.gz
    1.81 -	chmod 0644 $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/drivers/video/fglrx.ko.gz	
    1.82 +			$fs/lib/modules/$kvers-slitaz/kernel/drivers/video/fglrx.ko.gz
    1.83 +	chown root $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/fglrx.ko.gz
    1.84 +	chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/fglrx.ko.gz	
    1.85  	
    1.86  	cp -a $src/ATI_LICENSE.TXT $fs/usr/share/licenses/$PACKAGE
    1.87 -		
    1.88 -	cp -a $src/x740/usr/X11R6/lib/modules $fs/usr/lib/xorg
    1.89  	
    1.90  	cp -a $src/arch/x86/usr/lib/*.so $fs/usr/lib/
    1.91  	cp -a $src/arch/x86/usr/sbin $fs/usr
    1.92  	cp -a $src/arch/x86/usr/X11R6/bin/* $fs/usr/bin/
    1.93 -	
    1.94 +
    1.95 +	cp -a $src/x740/usr/X11R6/lib/modules $fs/usr/lib/xorg
    1.96  	cp -a $src/arch/x86/usr/X11R6/lib/*.so* $fs/usr/lib
    1.97  	cp -a $src/arch/x86/usr/X11R6/lib/modules $fs/usr/lib/xorg	
    1.98  	
    1.99 @@ -79,9 +70,7 @@
   1.100  	cp -a $src/common/usr/share/applications $fs/usr/share
   1.101  	cp -a $src/common/usr/share/doc $fs/usr/share
   1.102  	cp -a $src/common/usr/share/ati $fs/usr/share
   1.103 -	cp -a $src/common/usr/X11R6/bin/* $fs/usr/bin		
   1.104 -	
   1.105 -
   1.106 +	cp -a $src/common/usr/X11R6/bin/* $fs/usr/bin
   1.107  }
   1.108  
   1.109  pre_install()
   1.110 @@ -93,7 +82,6 @@
   1.111  	echo "You must accept the license."
   1.112      echo "================================================================================"
   1.113      echo ""
   1.114 -	
   1.115  }
   1.116  
   1.117  post_install()
   1.118 @@ -125,8 +113,6 @@
   1.119  		echo "You did not accept the license, Removing the pkg."	
   1.120  		tazpkg remove "$PACKAGE"		
   1.121  	fi
   1.122 -
   1.123 -  
   1.124  }
   1.125  
   1.126  post_remove()
   1.127 @@ -134,5 +120,3 @@
   1.128  	echo "Processing post-remove commands..."
   1.129  	depmod -a
   1.130  }
   1.131 -
   1.132 -TAZBB_NO_INSTALL="because this is not hardware neutral"