From vmiklos at frugalware.org Fri Dec 1 00:02:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 00:02:39 2006 Subject: [Frugalware-darcs] frugalware-current: wlan-ng-0.2.5-5-i686 Message-ID: <20061130230235.0371FFA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061130225959-e2957-e9462f3c50f9a7072c7fc0b70f3977b864da204c.gz; [wlan-ng-0.2.5-5-i686 VMiklos **20061130225959 kernel-2.6.19 ] { hunk ./source/network-extra/wlan-ng/FrugalBuild 7 -pkgrel=4 +pkgrel=5 hunk ./source/network-extra/wlan-ng/FrugalBuild 24 + find . -type f -exec sed -i '/#include /d' {} \; } From vmiklos at frugalware.org Fri Dec 1 00:14:18 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 00:14:22 2006 Subject: [Frugalware-darcs] frugalware-current: rt2500-1.1.0_b4-10-i686 Message-ID: <20061130231418.CA254FA46EA@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061130231220-e2957-7f4fbd23b9d4867a6f3e2605ca6d4cdabc255f8f.gz; [rt2500-1.1.0_b4-10-i686 VMiklos **20061130231220 kernel-2.6.19 ] { hunk ./source/network-extra/rt2500/FrugalBuild 6 -pkgrel=9 +pkgrel=10 hunk ./source/network-extra/rt2500/FrugalBuild 19 + find . -type f -exec sed -i '/#include /d' {} \; } From vmiklos at frugalware.org Fri Dec 1 00:32:47 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 00:32:51 2006 Subject: [Frugalware-darcs] frugalware-current: qc-usb-0.6.6-4-i686 Message-ID: <20061130233248.05AE9FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061130233052-e2957-edf38d99eff6d1024a7d026f46a181c41083f932.gz; [qc-usb-0.6.6-4-i686 VMiklos **20061130233052 kernel-2.6.19 ] { hunk ./source/multimedia-extra/qc-usb/FrugalBuild 6 -pkgrel=3 +pkgrel=4 } From vmiklos at frugalware.org Fri Dec 1 00:41:36 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 00:41:39 2006 Subject: [Frugalware-darcs] frugalware-current: rlocate-0.5.3-5-i686 Message-ID: <20061130234137.184B3FA46F6@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061130233951-e2957-d5c477f087d4b7aa3a2132bc59ba2f4148ec0d01.gz; [rlocate-0.5.3-5-i686 VMiklos **20061130233951 kernel-2.6.19 ] { hunk ./source/apps-extra/rlocate/FrugalBuild 6 -pkgrel=4 +pkgrel=5 } From vmiklos at frugalware.org Fri Dec 1 00:51:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 00:51:26 2006 Subject: [Frugalware-darcs] frugalware-current: cdemu-0.8-9-i686 Message-ID: <20061130235123.D0419FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061130234938-e2957-4ef60ea5780c264bf7c4ac1d0d816fd225a4f069.gz; [cdemu-0.8-9-i686 VMiklos **20061130234938 kernel-2.6.19 ] { hunk ./source/apps-extra/cdemu/FrugalBuild 6 -pkgrel=8 +pkgrel=9 } From vmiklos at frugalware.org Fri Dec 1 01:01:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 01:01:26 2006 Subject: [Frugalware-darcs] frugalware-current: adm8211-20060111-11-i686 Message-ID: <20061201000123.3C5C1FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061130235924-e2957-33bb5f810ae53964c9a5c31e39fab645fb56c392.gz; [adm8211-20060111-11-i686 VMiklos **20061130235924 kernel-2.6.19 ] { hunk ./source/network-extra/adm8211/FrugalBuild 6 -pkgrel=10 +pkgrel=11 hunk ./source/network-extra/adm8211/FrugalBuild 20 + find . -type f -exec sed -i '/#include /d' {} \; } From vmiklos at frugalware.org Fri Dec 1 01:25:22 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 01:25:25 2006 Subject: [Frugalware-darcs] frugalware-current: dazuko-2.3.2-1-i686 Message-ID: <20061201002522.C18FCFA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201002323-e2957-5a08098824fa71e5269e99d3ef2695eaa4698fa7.gz; [dazuko-2.3.2-1-i686 VMiklos **20061201002323 version bump built against kernel-2.6.19 ] { hunk ./source/apps-extra/dazuko/FrugalBuild 5 -pkgver=2.3.1 -pkgrel=5 +pkgver=2.3.2 +pkgrel=1 hunk ./source/apps-extra/dazuko/FrugalBuild 16 -sha1sums=('16e00e054973a18e10ca50ed6f894224c9d54a9d' \ - 'cb594d340b3874cea03f74092f3f570c18186fc0') hunk ./source/apps-extra/dazuko/FrugalBuild 24 + find . -type f -exec sed -i '/#include /d' {} \; hunk ./source/apps-extra/dazuko/FrugalBuild 34 +sha1sums=('a0c404062d3eb0f095aa4fc75f6279f61a5e8700' \ + 'cb594d340b3874cea03f74092f3f570c18186fc0') + } From vmiklos at frugalware.org Fri Dec 1 01:36:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 01:36:46 2006 Subject: [Frugalware-darcs] frugalware-current: ipw3945-1.1.2-4-i686 Message-ID: <20061201003642.B717DFA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201003452-e2957-56324b4035fe26963990b0ea730bba4c809fd781.gz; [ipw3945-1.1.2-4-i686 VMiklos **20061201003452 kernel-2.6.19 ] { hunk ./source/network-extra/ipw3945/FrugalBuild 6 -pkgrel=3 +pkgrel=4 hunk ./source/network-extra/ipw3945/FrugalBuild 21 + find . -type f -exec sed -i '/#include /d' {} \; } From xbit at frugalware.org Fri Dec 1 11:58:26 2006 From: xbit at frugalware.org (xbit@frugalware.org) Date: Fri Dec 1 11:58:32 2006 Subject: [Frugalware-darcs] pacman-tools: rf - clean source and fpm always Message-ID: <20061201105826.F31F2FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20061201104951-f81c5-46dfe5be32284aa7e1072a31dc84301a0656cea8.gz; [rf - clean source and fpm always xbit@frugalware.org**20061201104951] { hunk ./rf 117 - + +#=item B<-c> +# +# Try to delete source and .fpm files +# hunk ./rf 508 -Getopts::getopts('hmr:a:o:p:g:n:s:f:v:dqkt:l:WRCPULH', \%opts); +Getopts::getopts('chmr:a:o:p:g:n:s:f:v:dqkt:l:WRCPULH', \%opts); hunk ./rf 671 - my ($ec,$ev,$ir); - unless ($opts{'q'}){ - print "Cleanup on server\n"; - my $repo_=$repo . '/' if $repo; - print "Nothing to do, that's fine!\n\n" unless @sourcefiles || @pkgfiles; - if (@sourcefiles){ - my (@indarcs) = qx"repoman -t $version ls _darcs/current/$repo_/source/$group/$pkgname/ 2>&1"; - my (@inrepo) = qx"repoman -t $version ls $repo_/source/$group/$pkgname/ 2>&1"; - if ($inrepo[1] =~ 'No such file or') { - print "Probably it is a new package, passing by...\n"; - return; - } - splice(@inrepo,0,1); - @inrepo = grep $_ ne "Changelog\n",@inrepo; - foreach $ir (@inrepo){ - unless(scalar grep(/\Q$ir\E/, @indarcs)){ - $ec = apply "repoman -t $version del $repo/source/$group/$pkgname/$ir";}}} - if (@pkgfiles){ - # if( my $oldf = getoldfpm("$serverprefix/$repo/$repodir/",$pkgname) ){ - # apply "repoman -t $version del $repo/$repodir/$oldf";}}} - for my $pkgfile (@pkgfiles){ - $pkgfile =~ /^(.*)-.*?-.*?-.*?fpm\Z/; - print "Something nasty with $pkgfile, is it a package file?" unless $1; - if( my $oldf = getoldfpm("$serverprefix/$repo/$repodir/",$1) ){ - $ev = apply "repoman -t $version del $repo/$repodir/$oldf";}}}} - die "Cleaning up FAILED!" if $ec||$ev; + my ($ec,$ev,$ir); + unless ($opts{'q'}){ + print "Cleanup on server\n"; + my $repo_=$repo . '/' if $repo; +# print "Nothing to do, that's fine!\n\n" unless @sourcefiles || @pkgfiles; +# if (@sourcefiles){ + my (@indarcs) = qx"repoman -t $version ls _darcs/current/$repo_/source/$group/$pkgname/ 2>&1"; + my (@inrepo) = qx"repoman -t $version ls $repo_/source/$group/$pkgname/ 2>&1"; + if ($inrepo[1] =~ 'No such file or') { + print "Probably it is a new package, passing by...\n"; + return; +# } + splice(@inrepo,0,1); + @inrepo = grep $_ ne "Changelog\n",@inrepo; + foreach $ir (@inrepo){ + unless(scalar grep(/\Q$ir\E/, @indarcs)){ + $ec = apply "repoman -t $version del $repo/source/$group/$pkgname/$ir";}}} + if (@pkgfiles){ + # if( my $oldf = getoldfpm("$serverprefix/$repo/$repodir/",$pkgname) ){ + # apply "repoman -t $version del $repo/$repodir/$oldf";}}} + for my $pkgfile (@pkgfiles){ + $pkgfile =~ /^(.*)-.*?-.*?-.*?fpm\Z/; + print "Something nasty with $pkgfile, is it a package file?" unless $1; + if( my $oldf = getoldfpm("$serverprefix/$repo/$repodir/",$1) ){ + $ev = apply "repoman -t $version del $repo/$repodir/$oldf"; + } + } + } else { # at least try to del old fpm + if( my $oldf = getoldfpm("$serverprefix/$repo/$repodir/",$pkgname) ){ + $ev = apply "repoman -t $version del $repo/$repodir/$oldf"; + } else { print "Can't del package file!"; } + } + } + die "Cleaning up FAILED!" if $ec||$ev; } From vmiklos at frugalware.org Fri Dec 1 14:08:23 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 14:08:27 2006 Subject: [Frugalware-darcs] frugalware-current: swt-3.2.1-1-x86_64 Message-ID: <20061201130823.8CA1AFA4700@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201130534-e2957-0375abd67512f2220876c37b6fa047d0e6e2eda9.gz; [swt-3.2.1-1-x86_64 VMiklos **20061201130534 added x86_64 to archs() ] { hunk ./source/devel-extra/swt/FrugalBuild 13 -archs=('i686') +archs=('i686' 'x86_64') hunk ./source/devel-extra/swt/FrugalBuild 22 - export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386 + if [ "$CARCH" == "i686" ]; then + export AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386 + elif [ "$CARCH" == "x86_64" ]; then + export AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 + fi } From crazy at frugalware.org Fri Dec 1 16:11:14 2006 From: crazy at frugalware.org (crazy) Date: Fri Dec 1 16:11:18 2006 Subject: [Frugalware-darcs] frugalware-current: gavl-0.2.5-1-i686 Message-ID: <20061201151115.1398DFA46EA@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201150806-f6986-4cb9edc3824a1ee9a438305329e892fd5671f61d.gz; [gavl-0.2.5-1-i686 crazy **20061201150806 * Version bump ] { hunk ./source/lib-extra/gavl/FrugalBuild 5 -pkgver=0.2.4 +pkgver=0.2.5 hunk ./source/lib-extra/gavl/FrugalBuild 8 +_F_sourceforge_dirname="gmerlin" +Finclude sourceforge hunk ./source/lib-extra/gavl/FrugalBuild 15 -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=19684|grep -m1 'gavl-'|sed 's/.*vl-\(.*\).tar.gz.*/\1/'" -source=(http://heanet.dl.sourceforge.net/sourceforge/gmerlin/$pkgname-$pkgver.tar.gz) -sha1sums=('b4b4a9df224a07090ae042a8d5ac103470c1d650') +sha1sums=('6fad2bca2ee4a050b67b47c162380cb470d34c9c') } From crazy at frugalware.org Fri Dec 1 16:27:45 2006 From: crazy at frugalware.org (crazy) Date: Fri Dec 1 16:27:48 2006 Subject: [Frugalware-darcs] frugalware-current: gmerlin-0.3.5-1-i686 Message-ID: <20061201152745.86C38FA46F6@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201152432-f6986-b27b4167e549ee49d563044eab892ba77395fe88.gz; [gmerlin-0.3.5-1-i686 crazy **20061201152432 * Version bump ] { hunk ./source/xapps-extra/gmerlin/FrugalBuild 5 -pkgver=0.3.4 -pkgrel=4 +pkgver=0.3.5 +pkgrel=1 hunk ./source/xapps-extra/gmerlin/FrugalBuild 8 +_F_sourceforge_broken_up2date=1 hunk ./source/xapps-extra/gmerlin/FrugalBuild 11 -depends=('esd' 'libcdio' 'libxv' 'gavl' 'libmusicbrainz' 'freetype2' 'libxml2' 'transcode' \ +depends=('esd' 'libcdio' 'libxv' 'gavl>=0.2.5' 'libmusicbrainz' 'freetype2' 'libxml2' 'transcode' \ hunk ./source/xapps-extra/gmerlin/FrugalBuild 17 -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=19684|grep -m1 'gmerlin-\(.*\).tar.gz'|sed 's/.*lin-\(.*\).tar.gz.*/\1/'" hunk ./source/xapps-extra/gmerlin/FrugalBuild 18 -sha1sums=('a5117e866b354183c568649cd30f5847469d1431' \ +sha1sums=('cc53da6fe7a05959dc5e6f8c761f1b50f163acf3' \ hunk ./source/xapps-extra/gmerlin/FrugalBuild 21 - } From crazy at frugalware.org Fri Dec 1 16:49:47 2006 From: crazy at frugalware.org (crazy) Date: Fri Dec 1 16:49:51 2006 Subject: [Frugalware-darcs] frugalware-current: gmerlin-encoders-0.2.3-1-i686 Message-ID: <20061201154948.02BF0FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201154601-f6986-62ac6196636a607040a97a71f9bf015136874f96.gz; [gmerlin-encoders-0.2.3-1-i686 crazy **20061201154601 * Version bump ] { hunk ./source/xapps-extra/gmerlin-encoders/disable-speex.patch 1 -diff -Naur gmerlin-encoders-0.2.2/configure.ac gmerlin-encoders-0.2.2-p/configure.ac ---- gmerlin-encoders-0.2.2/configure.ac 2006-07-02 13:35:39.000000000 +0200 -+++ gmerlin-encoders-0.2.2-p/configure.ac 2006-08-26 16:55:16.880418192 +0200 -@@ -115,7 +115,7 @@ - - SPEEX_REQUIRED="1.0.4" - --PKG_CHECK_MODULES(SPEEX, speex >= $SPEEX_REQUIRED, have_speex="true", have_speex="false") -+PKG_CHECK_MODULES(SPEEX, speex = $SPEEX_REQUIRED, have_speex="true", have_speex="false") - AC_SUBST(SPEEX_REQUIRED) - AC_SUBST(SPEEX_LIBS) - AC_SUBST(SPEEX_CFLAGS) rmfile ./source/xapps-extra/gmerlin-encoders/disable-speex.patch hunk ./source/xapps-extra/gmerlin-encoders/FrugalBuild 5 -pkgver=0.2.2 -pkgrel=2 +pkgver=0.2.3 +pkgrel=1 hunk ./source/xapps-extra/gmerlin-encoders/FrugalBuild 9 +_F_sourceforge_broken_up2date=1 hunk ./source/xapps-extra/gmerlin-encoders/FrugalBuild 12 -depends=('gmerlin>=0.3.4-2') +depends=('gmerlin>=0.3.5') hunk ./source/xapps-extra/gmerlin-encoders/FrugalBuild 16 -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=19684|grep -m1 'gmerlin-encoders-\(.*\).tar.gz'|sed 's/.*ders-\(.*\).tar.gz.*/\1/'" -source=($source disable-speex.patch) -sha1sums=('a5d3b650903d215c41bc5b51a68536f96e4e0015' \ - '6b8e050b7ca77c057e895d6693a81687212f5b02') +sha1sums=('9ef5eca553e458add608665ab00d39487c8c453f') } From crazy at frugalware.org Fri Dec 1 17:11:49 2006 From: crazy at frugalware.org (crazy) Date: Fri Dec 1 17:11:53 2006 Subject: [Frugalware-darcs] frugalware-current: gmerlin-avdecoder-0.1.5-1-i686 Message-ID: <20061201161149.72793FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201160743-f6986-7ed381b4c73b3e643a3929f172e3f104d9bc44a5.gz; [gmerlin-avdecoder-0.1.5-1-i686 crazy **20061201160743 * Version bump ] { hunk ./source/xapps-extra/gmerlin-avdecoder/FrugalBuild 5 -pkgver=0.1.4 -pkgrel=2 +pkgver=0.1.5 +pkgrel=1 hunk ./source/xapps-extra/gmerlin-avdecoder/FrugalBuild 9 +_F_sourceforge_broken_up2date=1 hunk ./source/xapps-extra/gmerlin-avdecoder/FrugalBuild 13 -depends=('gmerlin>=0.3.4-2' 'libmpcdec' 'libtiff' 'mpeg2dec' 'libcdio' 'libdvdread' 'speex' 'libmad') +depends=('gmerlin>=0.3.5' 'libmpcdec' 'libtiff' 'mpeg2dec' 'libcdio' 'libdvdread' 'speex' 'libmad') hunk ./source/xapps-extra/gmerlin-avdecoder/FrugalBuild 20 -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=19684|grep -m1 'gmerlin-avdecoder-\(.*\).tar.gz'|sed 's/.*der-\(.*\).tar.gz.*/\1/'" -sha1sums=('19f5f1ef24c5d6778647657a77b90d514cf07045') +sha1sums=('18b059eb164319bbb4a597d3a6c4ae0c5f033468') } From alex at alex-smith.me.uk Fri Dec 1 17:36:39 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Fri Dec 1 17:36:44 2006 Subject: [Frugalware-darcs] frugalware-current: nvidia-1.0_9629-4-i686 Message-ID: <20061201163640.644A9FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201163605-46e39-206de0665fe5cea568da0aba67ba2d7b7c5b19b5.gz; [nvidia-1.0_9629-4-i686 AlexExtreme **20061201163605 * kernel-2.6.19 ] { hunk ./source/x11-extra/nvidia/FrugalBuild 7 -pkgrel=3 +pkgrel=4 } From vmiklos at frugalware.org Fri Dec 1 19:39:50 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 19:39:54 2006 Subject: [Frugalware-darcs] frugalware-current: user-mode-linux-2.6.19-1-i686 Message-ID: <20061201183950.E90C7FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201183722-e2957-2fd0cfdfe7b7977bc12c53efaa5f393839f7c783.gz; [user-mode-linux-2.6.19-1-i686 VMiklos **20061201183722 version bump original heders.diff is now in upstream but we have a new problem.. :) ] { hunk ./source/apps-extra/user-mode-linux/FrugalBuild 5 -pkgver=2.6.18 -patchlevel=.1 +pkgver=2.6.19 +patchlevel= hunk ./source/apps-extra/user-mode-linux/FrugalBuild 15 - config headers.diff glibc25.diff) -signatures=($source.sign '' '' '') + config headers.diff) +signatures=($source.sign '' '') hunk ./source/apps-extra/user-mode-linux/FrugalBuild 27 + # ld needs different LDFLAGS then gcc so the only option is not using it + unset LDFLAGS hunk ./source/apps-extra/user-mode-linux/headers.diff 1 -I need this patch to get a UML kernel to compile. This is with the kernel -headers in FC6 which are automatically generated from the kernel tree. -Some headers are missing but those files don't need them. At least it -appears so since the resuling kernel works fine. - -Tested on x86-64. - - -Signed-off-by: Ulrich Drepper - -diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h -index 59cfa9e..cec9fcc 100644 ---- a/arch/um/include/kern_util.h -+++ b/arch/um/include/kern_util.h -@@ -6,7 +6,6 @@ - #ifndef __KERN_UTIL_H__ - #define __KERN_UTIL_H__ - --#include "linux/threads.h" - #include "sysdep/ptrace.h" - #include "sysdep/faultinfo.h" +--- arch/um/sys-i386/user-offsets.c.orig 2006-12-01 19:18:07.000000000 +0100 ++++ arch/um/sys-i386/user-offsets.c 2006-12-01 19:19:27.000000000 +0100 +@@ -11,6 +11,13 @@ + #define DEFINE_LONGS(sym, val) \ + asm volatile("\n->" #sym " %0 " #val : : "i" (val/sizeof(unsigned long))) hunk ./source/apps-extra/user-mode-linux/headers.diff 7 -diff --git a/arch/um/sys-x86_64/stub_segv.c b/arch/um/sys-x86_64/stub_segv.c -index 1c96702..652fa34 100644 ---- a/arch/um/sys-x86_64/stub_segv.c -+++ b/arch/um/sys-x86_64/stub_segv.c -@@ -5,7 +5,6 @@ ++#undef offsetof ++#ifdef __compiler_offsetof ++#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) ++#else ++#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) ++#endif ++ + #define OFFSET(sym, str, mem) \ + DEFINE(sym, offsetof(struct str, mem)); hunk ./source/apps-extra/user-mode-linux/headers.diff 17 - #include - #include --#include - #include - #include "uml-config.h" - #include "sysdep/sigcontext.h" } From vmiklos at frugalware.org Fri Dec 1 19:57:03 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 19:57:11 2006 Subject: [Frugalware-darcs] frugalware-current: tar-1.16-2-i686 Message-ID: <20061201185703.7FCB6FA46EA@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201185512-e2957-8a31c6baa67f91267942f36b04e3c54765f2659e.gz; [tar-1.16-2-i686 VMiklos **20061201185512 added 18355.diff closes #1496 ] { addfile ./source/base/tar/18355.diff hunk ./source/base/tar/18355.diff 1 +diff -u tar-1.16/src/extract.c tar-1.16/src/extract.c +--- tar-1.16/src/extract.c ++++ tar-1.16/src/extract.c +@@ -1122,7 +1122,13 @@ + break; + + case GNUTYPE_NAMES: +- *fun = extract_mangle_wrapper; ++ if (allow_name_mangling_option) { ++ *fun = extract_mangle_wrapper; ++ } ++ else { ++ ERROR ((0, 0, _("GNUTYPE_NAMES mangling ignored"))); ++ *fun = extract_failure; ++ } + break; + + case GNUTYPE_MULTIVOL: +only in patch2: +unchanged: +--- tar-1.16.orig/src/tar.c ++++ tar-1.16/src/tar.c +@@ -247,6 +247,7 @@ + enum + { + ANCHORED_OPTION = CHAR_MAX + 1, ++ ALLOW_NAME_MANGLING_OPTION, + ATIME_PRESERVE_OPTION, + BACKUP_OPTION, + CHECKPOINT_OPTION, +@@ -705,6 +706,8 @@ + + {NULL, 'o', 0, 0, + N_("when creating, same as --old-archive; when extracting, same as --no-same-owner"), GRID+1 }, ++ {"allow-name-mangling", ALLOW_NAME_MANGLING_OPTION, 0, 0, ++ N_("when creating, allow GNUTYPE_NAMES mangling -- considered dangerous"), GRID+1 }, + #undef GRID + + #define GRID 120 +@@ -1431,6 +1434,10 @@ + set_use_compress_program_option ("compress"); + break; + ++ case ALLOW_NAME_MANGLING_OPTION: ++ allow_name_mangling_option = true; ++ break; ++ + case ANCHORED_OPTION: + args->matching_flags |= EXCLUDE_ANCHORED; + break; +only in patch2: +unchanged: +--- tar-1.16.orig/src/common.h ++++ tar-1.16/src/common.h +@@ -105,6 +105,9 @@ + + GLOBAL bool absolute_names_option; + ++/* Allow GNUTYPE_NAMES type? */ ++GLOBAL bool allow_name_mangling_option; ++ + /* Display file times in UTC */ + GLOBAL bool utc_option; + hunk ./source/base/tar/FrugalBuild 6 -pkgrel=1 +pkgrel=2 hunk ./source/base/tar/FrugalBuild 14 - $pkgname-$pkgver-lzma.diff) + $pkgname-$pkgver-lzma.diff 18355.diff) hunk ./source/base/tar/FrugalBuild 26 - 'f3002245c89881177764cc5e54bcafca64ebec2c') + 'f3002245c89881177764cc5e54bcafca64ebec2c' \ + 'fff8c96eb17e644214891e3cf44a9ed39bbf392c') } From crazy at frugalware.org Fri Dec 1 21:00:40 2006 From: crazy at frugalware.org (crazy) Date: Fri Dec 1 21:00:43 2006 Subject: [Frugalware-darcs] frugalware-current: qt4-4.2.2-1-i686 Message-ID: <20061201200041.1BD84FA46EA@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201195704-f6986-b01794630d05574c54ec40ca69e859e6398f1b9f.gz; [qt4-4.2.2-1-i686 crazy **20061201195704 * Version bump ] { hunk ./source/kde-extra/qt4/FrugalBuild 6 -pkgver=4.2.1 +pkgver=4.2.2 hunk ./source/kde-extra/qt4/FrugalBuild 23 - http://ftp.frugalware.org/pub/other/sources/kde/$pkgname/remove-crap.patch) -sha1sums=('3e74c0e71476bee68c24676838e0dfdd4b18d77e' \ + http://ftp.frugalware.org/pub/other/sources/kde/$pkgname/remove-crap2.patch) +sha1sums=('8bee428d975f855ed02517763010002ca99715cc' \ hunk ./source/kde-extra/qt4/FrugalBuild 32 - '5e79e4d5419bd0848beffc2b76ac7aa083c77c48') + '6d3e97f11d491c2f15fa56bd7f563597045e22a4') } From vmiklos at frugalware.org Fri Dec 1 21:09:21 2006 From: vmiklos at frugalware.org (VMiklos) Date: Fri Dec 1 21:09:23 2006 Subject: [Frugalware-darcs] frugalware-current: gnupg-1.4.5-2-i686 Message-ID: <20061201200921.2CB07FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201200806-e2957-b41a7b95c038cab9c92034c1a3f96fac50e36545.gz; [gnupg-1.4.5-2-i686 VMiklos **20061201200806 added CVE-2006-6169.diff closes #1497 ] { addfile ./source/apps/gnupg/CVE-2006-6169.diff hunk ./source/apps/gnupg/CVE-2006-6169.diff 1 +--- STABLE-BRANCH-1-4/g10/openfile.c 2006/08/01 12:22:38 4215 ++++ STABLE-BRANCH-1-4/g10/openfile.c 2006/11/27 16:40:14 4349 +@@ -144,8 +144,8 @@ + + s = _("Enter new filename"); + +- n = strlen(s) + namelen + 10; + defname = name && namelen? make_printable_string( name, namelen, 0): NULL; ++ n = strlen(s) + (defname?strlen (defname):0) + 10; + prompt = xmalloc(n); + if( defname ) + sprintf(prompt, "%s [%s]: ", s, defname ); hunk ./source/apps/gnupg/FrugalBuild 6 -pkgrel=1 +pkgrel=2 hunk ./source/apps/gnupg/FrugalBuild 13 -source=(ftp://ftp.gnupg.org/GnuPG/gnupg/$pkgname-$pkgver.tar.gz) -signatures=($source.sig) +source=(ftp://ftp.gnupg.org/GnuPG/gnupg/$pkgname-$pkgver.tar.gz CVE-2006-6169.diff) +signatures=($source.sig '') } From crazy at frugalware.org Fri Dec 1 21:34:26 2006 From: crazy at frugalware.org (crazy) Date: Fri Dec 1 21:34:29 2006 Subject: [Frugalware-darcs] frugalware-current: qbittorrent-0.8.0-2-i686 Message-ID: <20061201203426.75313FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061201203005-f6986-70213a2f49e21d8b834239324dad107b566cdb5a.gz; [qbittorrent-0.8.0-2-i686 crazy **20061201203005 * Version bump ] { hunk ./source/kde-extra/qbittorrent/FrugalBuild 6 -pkgrel=1 +pkgrel=2 hunk ./source/kde-extra/qbittorrent/FrugalBuild 8 -depends=('qt4>=4.2.1' 'rblibtorrent>=0.11' 'curl>=7.16.0' 'python>=2.5') +depends=('qt4>=4.2.2' 'rblibtorrent>=0.11' 'curl>=7.16.0' 'python>=2.5') } From janny at frugalware.org Sat Dec 2 12:59:22 2006 From: janny at frugalware.org (Janny) Date: Sat Dec 2 12:59:24 2006 Subject: [Frugalware-darcs] frugalware-current: knetstats-1.6.1-1-i686 Message-ID: <20061202115922.34B5FFA46EA@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202115817-ee5de-efcccd700ee6c14e248f665ef52adeb0e8bd923c.gz; [knetstats-1.6.1-1-i686 Janny **20061202115817 version bump ] { hunk ./source/kde-extra/knetstats/FrugalBuild 1 -# Compiling time: 0.00 SBU +# Compiling time: 0.41 SBU hunk ./source/kde-extra/knetstats/FrugalBuild 5 -pkgver=1.6 +pkgver=1.6.1 hunk ./source/kde-extra/knetstats/FrugalBuild 16 -sha1sums=('d0fc4e988ceeb5025bed61d9148aa0886e0aae6d') +sha1sums=('1b4634482d0ce0ff504546f8ee62643368c853ff') } From crazy at frugalware.org Sat Dec 2 13:04:03 2006 From: crazy at frugalware.org (crazy) Date: Sat Dec 2 13:04:11 2006 Subject: [Frugalware-darcs] frugalware-current: nano-2.0.1-1-i686 Message-ID: <20061202120404.A8F98FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202115715-f6986-b917378cce126a4948c529a8be191194b4ee378e.gz; [nano-2.0.1-1-i686 crazy **20061202115715 * Version bump * reworked frugalware.patch * added more _F_*|F* commands for the FrugalBuild syntax ( still not all ) ] { hunk ./source/apps/nano/FrugalBuild 5 -pkgver=1.9.99pre3 +pkgver=2.0.1 hunk ./source/apps/nano/FrugalBuild 13 -up2date="lynx -dump $url|grep 'Latest Version'|sed 's/.*stable.* \(.*\) .*/\1/'" -source=($url/dist/v1.3/$pkgname-$pkgver.tar.gz \ +up2date="lynx -dump http://www.nano-editor.org/dist/v2.0/|Flasttar" +source=($url/dist/v2.0/$pkgname-$pkgver.tar.gz \ hunk ./source/apps/nano/FrugalBuild 16 -backup=(etc/nanorc) -sha1sums=('1843b25ba755683abf34c57fad6ef62d88c2562c' \ - '364f5c6e44d8e81784fe9fefe9847b2a279d2c93' \ +backup=('etc/nanorc') +sha1sums=('9c5e26893879355e41e417de30e9473439ceaf5d' \ + 'cbfc4310437b856272b76e37fdd9d6d7f5fc1712' \ hunk ./source/apps/nano/FrugalBuild 21 + hunk ./source/apps/nano/frugalware.patch 1 -diff -Naur nano-1.9.99pre1/doc/nanorc.sample.in nano-1.9.99pre1-p/doc/nanorc.sample.in ---- nano-1.9.99pre1/doc/nanorc.sample.in 2006-07-31 01:46:22.000000000 +0200 -+++ nano-1.9.99pre1-p/doc/nanorc.sample.in 2006-09-05 02:31:20.000000000 +0200 +diff -Naur nano-2.0.1/doc/nanorc.sample.in nano-2.0.1-p/doc/nanorc.sample.in +--- nano-2.0.1/doc/nanorc.sample.in 2006-11-02 07:32:02.000000000 +0100 ++++ nano-2.0.1-p/doc/nanorc.sample.in 2006-12-02 12:39:31.000000000 +0100 hunk ./source/apps/nano/frugalware.patch 80 -@@ -213,45 +213,51 @@ - ## - ## All regexes should be extended regular expressions. +@@ -215,46 +215,50 @@ hunk ./source/apps/nano/frugalware.patch 82 -+## Frugalware Linux note: -+## DO _NOT_ USE @PKGDATADIR@ folder to modify -+## the X.nanorc files. hunk ./source/apps/nano/frugalware.patch 138 + + ## POV-Ray +-# include "@PKGDATADIR@/pov.nanorc" ++include "@PKGDATADIR@/pov.nanorc" hunk ./source/apps/nano/frugalware.patch 143 -+## FrugalBuild ++## FrugalBuild hunk ./source/apps/nano/frugalware.patch 145 -diff -Naur nano-1.9.99pre1/doc/syntax/frugalbuild.nanorc nano-1.9.99pre1-p/doc/syntax/frugalbuild.nanorc ---- nano-1.9.99pre1/doc/syntax/frugalbuild.nanorc 1970-01-01 01:00:00.000000000 +0100 -+++ nano-1.9.99pre1-p/doc/syntax/frugalbuild.nanorc 2006-09-05 07:01:52.000000000 +0200 -@@ -0,0 +1,40 @@ ++ +diff -Naur nano-2.0.1/doc/syntax/frugalbuild.nanorc nano-2.0.1-p/doc/syntax/frugalbuild.nanorc +--- nano-2.0.1/doc/syntax/frugalbuild.nanorc 1970-01-01 01:00:00.000000000 +0100 ++++ nano-2.0.1-p/doc/syntax/frugalbuild.nanorc 2006-12-02 12:47:50.000000000 +0100 +@@ -0,0 +1,42 @@ hunk ./source/apps/nano/frugalware.patch 164 -+color red "F(unpack_makeself|autoconfize|lasttar|lasttgz|lasttarbz2|msgfmt)" ++color red "F(unpack_makeself|autoconfize|lasttar|lasttgz|lasttarbz2|msgfmt|desktop2)" hunk ./source/apps/nano/frugalware.patch 170 -+color brightcyan "_F_sourceforge_(prefix|ext|mirror|dirname)" ++color brightcyan "_F_sourceforge_(prefix|ext|mirror|dirname|name|broken_up2date)" hunk ./source/apps/nano/frugalware.patch 174 -+color brightcyan "_F_kernel_(stable|rc|git|mm|vmlinuz|verbose|name|ver|dontsedarch)" ++color brightcyan "_F_kernel_(stable|rc|git|mm|vmlinuz|verbose|name|ver|dontsedarch|dontfakeversion|rel)" hunk ./source/apps/nano/frugalware.patch 184 ++## mono.sh ++color red "F(monoexport|monocleanup|build_mono)" hunk ./source/apps/nano/frugalware.patch 192 -diff -Naur nano-1.9.99pre1/doc/syntax/Makefile.am nano-1.9.99pre1-p/doc/syntax/Makefile.am ---- nano-1.9.99pre1/doc/syntax/Makefile.am 2006-06-01 20:35:39.000000000 +0200 -+++ nano-1.9.99pre1-p/doc/syntax/Makefile.am 2006-09-05 02:28:10.000000000 +0200 -@@ -11,6 +11,7 @@ +diff -Naur nano-2.0.1/doc/syntax/Makefile.am nano-2.0.1-p/doc/syntax/Makefile.am +--- nano-2.0.1/doc/syntax/Makefile.am 2006-11-02 07:32:02.000000000 +0100 ++++ nano-2.0.1-p/doc/syntax/Makefile.am 2006-12-02 12:35:26.000000000 +0100 +@@ -12,6 +12,7 @@ } From janny at frugalware.org Sat Dec 2 14:06:26 2006 From: janny at frugalware.org (Janny) Date: Sat Dec 2 14:06:30 2006 Subject: [Frugalware-darcs] frugalware-current: zvbi-0.2.24-1-i686 Message-ID: <20061202130626.A2FE2FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202130502-ee5de-56325cda5815411a1e4b2ffde4b43480579203bf.gz; [zvbi-0.2.24-1-i686 Janny **20061202130502 version bump ] { hunk ./source/lib-extra/zvbi/FrugalBuild 5 -pkgver=0.2.23 +pkgver=0.2.24 hunk ./source/lib-extra/zvbi/FrugalBuild 19 -sha1sums=('b5108e7aa246e5455ce5c51723d687d21d2b44f6') +sha1sums=('52edc268ee8a52cbeb5229eb153784643ead42b2') } From vmiklos at frugalware.org Sat Dec 2 14:19:15 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Dec 2 14:19:18 2006 Subject: [Frugalware-darcs] frugalware-current: lvm2-2.02.16-1-i686 Message-ID: <20061202131915.49269FA46F7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202130714-e2957-b3e7af420749745291931be8da2496ed5382c3d4.gz; [lvm2-2.02.16-1-i686 VMiklos **20061202130714 version bump ] { hunk ./source/apps/lvm2/FrugalBuild 5 -pkgver=2.02.15 +pkgver=2.02.16 } From vmiklos at frugalware.org Sat Dec 2 14:50:45 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Dec 2 14:50:48 2006 Subject: [Frugalware-darcs] frugalware-current: lha-1.14i_ac20050924p1-1-x86_64 Message-ID: <20061202135045.53626FA46EA@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202134732-e2957-cb504543550f7e93c070ac1eeb1e6cac694e07af.gz; [lha-1.14i_ac20050924p1-1-x86_64 VMiklos **20061202134732 version bump closes #1501 ] { hunk ./source/base/lha/FrugalBuild 1 -# Compiling Time: 0.01 SBU +# Compiling Time: 0.09 SBU hunk ./source/base/lha/FrugalBuild 5 -pkgver=114i +pkgver=1.14i_ac20050924p1 +rel_id=22231 hunk ./source/base/lha/FrugalBuild 13 -up2date="lynx -dump http://quox.org/install/archiver/lha.html|grep Version -1|sed -n 's/.*]\([0-9a-z\.]*\) .*/\1/;s/\.//;$ p'" -source=(http://www2m.biglobe.ne.jp/~dolphin/lha/prog/$pkgname-$pkgver.tar.gz) -sha1sums=('79e35271f2cf783f946db3f22e304fef72dbac99') - -build() -{ - Fcd - Fsed "^\(OPTIMIZE\t=\).*" "\1 $CFLAGS" Makefile - Fmake || return 1 - Fexerel src/lha /usr/bin/lha -} - -# optimization ok +up2date="elinks -dump http://sourceforge.jp/projects/lha/files/|grep tar.gz$|sed 's/.*lha-\(.*\)\.t.*/\1/;s/-/_/;q'" +source=(http://osdn.dl.sourceforge.jp/$pkgname/$rel_id/$pkgname-${pkgver/_/-}.tar.gz) +# this can be removed after Frugalware 0.6 +options=('force') +_F_cd_path="$pkgname-${pkgver/_/-}" +# optimization OK +sha1sums=('2491c8b584c21759f1d3819f57fa0e1cbc235092') } From vmiklos at frugalware.org Sat Dec 2 15:51:20 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Dec 2 15:51:23 2006 Subject: [Frugalware-darcs] frugalware-current: j2re-5.0_10-1-i686 Message-ID: <20061202145121.03185FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202144749-e2957-1173c6170622692f2ecc268d839e3c113c3199ce.gz; [j2re-5.0_10-1-i686 VMiklos **20061202144749 version bump now downloading the tarballs from http://download.java.net/dlj ] { hunk ./source/apps/j2re/FrugalBuild 5 -pkgver=5.0_09 +pkgver=5.0_10 hunk ./source/apps/j2re/FrugalBuild 11 -pkgurl="http://mirror.dcc.online.pt/Java/" hunk ./source/apps/j2re/FrugalBuild 14 -up2date="lynx -dump http://java.sun.com/javase/downloads/index.jsp|grep JRE.*Update|sed 's/.* \([0-9|.]*\) Update \([0-9\.]*\)/\1_0\2/'" +up2date="lynx -dump http://java.sun.com/javase/downloads/index.jsp|grep JRE.*Update|sed 's/.* \([0-9|.]*\) Update \([0-9\.]*\)/\1_\2/'" hunk ./source/apps/j2re/FrugalBuild 22 -source=($pkgurl/jre-$realver-linux-$_arch.bin j2re.sh) +source=(http://download.java.net/dlj/binaries/jdk-$realver-dlj-linux-$_arch.bin \ + https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh \ + j2re.sh) hunk ./source/apps/j2re/FrugalBuild 29 - echo "yes" | sh jre-$realver-linux-$_arch.bin 2> /dev/null || Fdie - cp -rf jre$oldpkgver $Fdestdir/usr/lib/java/jre || Fdie - for i in jre$oldpkgver/* ; do - if [ -f $i ] ; then - Frm `echo $i | sed "s|jre$oldpkgver|/usr/lib/java/jre|"` - fi - done - chown -R root.root $Fdestdir/* || Fdie + mkdir $pkgname + cd $pkgname + sh ../jdk-$realver-dlj-linux-$_arch.bin --accept-license + cd .. + sh construct.sh $pkgname linux-jdk linux-jre + Fmkdir /usr/lib/java + mv linux-jdk/jre $Fdestdir/usr/lib/java hunk ./source/apps/j2re/FrugalBuild 45 +sha1sums=('fc4883d6da60940cbe4b6c2575478cead26313ff' \ + '966b9c8229ef3dfb588c108124f367cc993cb581' \ + 'd7b32de18152a3ad4d520563c9f847eb864bfbc9') + } From vmiklos at frugalware.org Sat Dec 2 16:59:14 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Dec 2 16:59:18 2006 Subject: [Frugalware-darcs] frugalware-current: j2sdk-5.0_10-1-i686 Message-ID: <20061202155915.0061EFA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202154812-e2957-55701fe90441ad0a22205cbc1c778df6d1da7331.gz; [j2sdk-5.0_10-1-i686 VMiklos **20061202154812 version bump added a short TODO ] { hunk ./source/devel-extra/j2sdk/FrugalBuild 5 -pkgver=5.0_09 +pkgver=5.0_10 hunk ./source/devel-extra/j2sdk/FrugalBuild 11 -pkgurl="http://mirror.dcc.online.pt/Java/" hunk ./source/devel-extra/j2sdk/FrugalBuild 14 -up2date="lynx -dump http://java.sun.com/javase/downloads/index.jsp|grep JRE.*Update|sed 's/.* \([0-9|.]*\) Update \([0-9\.]*\)/\1_0\2/'" +up2date="lynx -dump http://java.sun.com/javase/downloads/index.jsp|grep JRE.*Update|sed 's/.* \([0-9|.]*\) Update \([0-9\.]*\)/\1_\2/'" hunk ./source/devel-extra/j2sdk/FrugalBuild 17 - sha1sums=('db6bc792aced4bbe3417c28075d075380dafb5ce') + sha1sums=('fc4883d6da60940cbe4b6c2575478cead26313ff') hunk ./source/devel-extra/j2sdk/FrugalBuild 22 -source=($pkgurl/jdk-$realver-linux-$_arch.bin j2sdk.sh) -sha1sums=(${sha1sums[@]} '8ece7898cf1e1b7f437455360c2549b0b8683723') +source=(http://download.java.net/dlj/binaries/jdk-$realver-dlj-linux-$_arch.bin \ + https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh \ + j2sdk.sh) +sha1sums=(${sha1sums[@]} '966b9c8229ef3dfb588c108124f367cc993cb581' \ + '8ece7898cf1e1b7f437455360c2549b0b8683723') + +# TODO: 1) update j2sdk.sh based on openjdk.sh +# 2) maybe package j2re as a subpkg of j2sdk? hunk ./source/devel-extra/j2sdk/FrugalBuild 33 - echo "yes" | sh jdk-$realver-linux-$_arch.bin 2> /dev/null || Fdie - cp -rf jdk$oldpkgver $Fdestdir/usr/lib/java || Fdie - for i in jdk$oldpkgver/* ; do - if [ -f $i ] ; then - Frm `echo $i | sed "s|jdk$oldpkgver|/usr/lib/java|"` - fi - done - Frm /usr/lib/java/{jre,demo} - chown -R root.root $Fdestdir/* Fdie + mkdir $pkgname + cd $pkgname + sh ../jdk-$realver-dlj-linux-$_arch.bin --accept-license + cd .. + sh construct.sh $pkgname linux-jdk linux-jre + rm -rf linux-jdk/{jre,src.zip} + mv linux-jdk $Fdestdir/usr/lib/java } From vmiklos at frugalware.org Sat Dec 2 17:08:19 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Dec 2 17:08:24 2006 Subject: [Frugalware-darcs] frugalware-current: bittorrent-5.0.2-1-x86_64 Message-ID: <20061202160819.37739FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202160259-e2957-4fb9ca8ce4775376e02bee820605179141040db0.gz; [bittorrent-5.0.2-1-x86_64 VMiklos **20061202160259 version bump ] { hunk ./source/network-extra/bittorrent/FrugalBuild 5 -pkgver=5.0.1 +pkgver=5.0.2 hunk ./source/network-extra/bittorrent/FrugalBuild 37 -sha1sums=('71289e177c5bf16f62f41ac5ea48393b45f36860' \ +sha1sums=('d3f6d91df063a3f2e7174abf154d4b38dbdd0d8a' \ } From vmiklos at frugalware.org Sat Dec 2 17:53:06 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Dec 2 17:53:08 2006 Subject: [Frugalware-darcs] frugalware-current: links-2.1pre26-1-x86_64 Message-ID: <20061202165306.9E776FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202165056-e2957-e9d1a536d80a80dbf7df2e1b880724a008be6334.gz; [links-2.1pre26-1-x86_64 VMiklos **20061202165056 version bump ] { hunk ./source/network-extra/links/FrugalBuild 5 -pkgver=2.1pre25 +pkgver=2.1pre26 hunk ./source/network-extra/links/FrugalBuild 18 -sha1sums=('a5c6dfe0632e1a72792b36e61135d7896d1a52e8') +sha1sums=('b0e2095dc4013f9fae2837af998f91edc6a565a6') } From crazy at frugalware.org Sat Dec 2 18:20:00 2006 From: crazy at frugalware.org (crazy) Date: Sat Dec 2 18:20:10 2006 Subject: [Frugalware-darcs] frugalware-current: hplip-1.6.10-2-i686 Message-ID: <20061202172000.CAA3EFA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202171313-f6986-bcc55d36cb382ce3730e45b675db96e35053d29e.gz; [hplip-1.6.10-2-i686 crazy **20061202171313 * just rebuild with net-snmp>=5.4 ( which changed so name version from .10 to .15 ) ] { hunk ./source/apps-extra/hplip/FrugalBuild 6 -pkgrel=1 +pkgrel=2 hunk ./source/apps-extra/hplip/FrugalBuild 10 -depends=('net-snmp' 'libusb' 'cups' 'zlib') +depends=('net-snmp>=5.4' 'libusb' 'cups' 'zlib') } From boobaa at frugalware.org Sat Dec 2 18:56:19 2006 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Dec 2 18:56:23 2006 Subject: [Frugalware-darcs] frugalware-current: man-pages-2.43-1-i686 Message-ID: <20061202175619.8CE85FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202175324-60d9d-ee6644eae6e0ea2044914147c4c509d504b77edf.gz; [man-pages-2.43-1-i686 CSÉCSY László **20061202175324 version bump ] { hunk ./source/apps/man-pages/FrugalBuild 6 -pkgver=2.41 +pkgver=2.43 hunk ./source/apps/man-pages/FrugalBuild 44 -sha1sums=('03c84e25fc8e4e463ab3a212e26cf584e816b925') +sha1sums=('4ddbc15b1fff213341b86104e8f64ac6b988cc8e') } From vmiklos at frugalware.org Sat Dec 2 19:13:10 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Dec 2 19:13:14 2006 Subject: [Frugalware-darcs] frugalware-current: grass-6.2.0-1-x86_64 Message-ID: <20061202181310.A63C3FA46EA@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202181140-e2957-962af944e3adfdf0a2d1de791facdca6d8d07e07.gz; [grass-6.2.0-1-x86_64 VMiklos **20061202180958 version bump ] { hunk ./source/xapps-extra/grass/FrugalBuild 5 -pkgver=6.1.0 -pkgrel=2 +pkgver=6.2.0 +pkgrel=1 hunk ./source/xapps-extra/grass/FrugalBuild 15 -source=($url/grass61/source/$pkgname-$pkgver.tar.gz) -sha1sums=('ea26163f42805a2571a0a35ac58457bffdbcfc1e') +source=($url/grass62/source/$pkgname-$pkgver.tar.gz) hunk ./source/xapps-extra/grass/FrugalBuild 18 + unset MAKEFLAGS + export CFLAGS="$CFLAGS -I/usr/include/gdal" hunk ./source/xapps-extra/grass/FrugalBuild 24 - Fsed "GISBASE=.*$" "GISBASE=/usr/grass-$pkgver" $Fdestdir/usr/bin/grass61 + Fsed "GISBASE=.*$" "GISBASE=/usr/grass-$pkgver" $Fdestdir/usr/bin/grass62 } [grass-6.2.0-1-x86_64 VMiklos **20061202181140 added missing sha1sums() ] { hunk ./source/xapps-extra/grass/FrugalBuild 29 +sha1sums=('ace7ddcd3219550dd7068948865d96ce5f16d289') + } From vmiklos at frugalware.org Sat Dec 2 19:25:39 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Dec 2 19:25:42 2006 Subject: [Frugalware-darcs] frugalware-current: openjdk-1.5.0_10-1-i686 Message-ID: <20061202182539.D244AFA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202182144-e2957-7990363fc7f874e91a3d05a27351461a7a30edd8.gz; [openjdk-1.5.0_10-1-i686 VMiklos **20061202182144 version bump ] { hunk ./source/devel-extra/openjdk/FrugalBuild 5 -pkgver=1.5.0_09 +pkgver=1.5.0_10 hunk ./source/devel-extra/openjdk/FrugalBuild 16 -up2date="elinks -dump http://openjdk.dev.java.net/hotspot/|grep zip$|sed 's|.*/\(.*\)\.zip|\1|;s/hotspot-7-ea-src-b02-08_nov_2006/1.5.0_09/'" -source=(http://www.java.net/download/.a2af6706b541c76a90f3597ee8e6a6eb/openjdk/jdk7/promoted/b02/hotspot-7-ea-src-b02-08_nov_2006.zip \ - openjdk-1.5.0_09-binutils.diff openj{dk,re}.sh) +up2date="elinks -dump http://openjdk.dev.java.net/hotspot/|grep zip$|sed 's|.*/\(.*\)\.zip|\1|;s/hotspot-7-ea-src-b03-30_nov_2006/1.5.0_10/'" +source=(http://www.java.net/download/openjdk/jdk7/promoted/b03/hotspot-7-ea-src-b03-30_nov_2006.zip \ + openj{dk,re}.sh) hunk ./source/devel-extra/openjdk/FrugalBuild 65 -sha1sums=('1bd58dd935b4cd9330a1b84755451c56eaa026a0' \ - 'ce10c10c6811269f8a21685357f2db6a3c3a67f5' \ +sha1sums=('965cdee9110fe93e266cd2b2f45deb7b3ef4d2e6' \ hunk ./source/devel-extra/openjdk/openjdk-1.5.0_09-binutils.diff 1 -diff --unified=4 build/linux/makefiles/vm.make-1.50 build/linux/makefiles/vm.make ---- build/linux/makefiles/vm.make-1.50 2006-11-08 09:11:05.000000000 -0800 -+++ build/linux/makefiles/vm.make 2006-11-09 14:03:56.000000000 -0800 -@@ -146,9 +146,9 @@ - LD_SCRIPT = libjvm.so.lds - $(LD_SCRIPT): $(LIBJVM_MAPFILE) - $(QUIETLY) { \ - rm -rf $@; \ -- $(LINK_VM) -Wl,--verbose $(LFLAGS_VM) 2>&1 > /dev/null | \ -+ $(LINK_VM) -Wl,--verbose $(LFLAGS_VM) 2>&1 | \ - sed -e '/^======/,/^======/!d' \ - -e '/^======/d' \ - -e 's/0\( + SIZEOF_HEADERS\)/$(JVM_BASE_ADDR)\1/' \ - > $@; \ rmfile ./source/devel-extra/openjdk/openjdk-1.5.0_09-binutils.diff } From boobaa at frugalware.org Sat Dec 2 19:40:31 2006 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Dec 2 19:40:34 2006 Subject: [Frugalware-darcs] frugalware-current: perl-gtk2-1.141-1-i686 Message-ID: <20061202184032.0268EFA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202183708-60d9d-88fb085a4cb8a6f54c25da20988732ab7f72b736.gz; [perl-gtk2-1.141-1-i686 CSÉCSY László **20061202183708 version bump ] { hunk ./source/devel-extra/perl-gtk2/FrugalBuild 6 -pkgver=1.140 +pkgver=1.141 hunk ./source/devel-extra/perl-gtk2/FrugalBuild 17 -sha1sums=('dc8d5a120538d6711033fa05c96e477bc618a0b2') +sha1sums=('71e13bae293350bd406ffa81c8c0ccd00a5d790f') } From boobaa at frugalware.org Sat Dec 2 20:18:58 2006 From: boobaa at frugalware.org (CSÉCSY László) Date: Sat Dec 2 20:19:02 2006 Subject: [Frugalware-darcs] frugalware-current: smarty-2.6.16-1-i686 Message-ID: <20061202191859.28023FA46F6@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202191626-60d9d-c32660c8c59c991c333ff220836c85f957d0cf66.gz; [smarty-2.6.16-1-i686 CSÉCSY László **20061202191626 version bump ] { hunk ./source/devel-extra/smarty/FrugalBuild 5 -pkgver=2.6.14 +pkgver=2.6.16 hunk ./source/devel-extra/smarty/FrugalBuild 15 -sha1sums=('88e14efacac936c565d6f3230f327233791ff32b') +sha1sums=('5ed8b49415f56e0e91645c241311d97aa72bb212') } From vmiklos at frugalware.org Sat Dec 2 20:44:05 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sat Dec 2 20:44:11 2006 Subject: [Frugalware-darcs] frugalware-current: twisted-2.4.0-1-i686 Message-ID: <20061202194406.0F7CCFA46F6@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202193556-e2957-f08e62f314203c9abcae9ee1db79890edef4c39e.gz; [twisted-2.4.0-1-i686 VMiklos **20061202193126 version bump up2date fix ] { hunk ./source/devel-extra/twisted/FrugalBuild 5 -pkgver=2.2.0 -pkgrel=2 +pkgver=2.4.0 +pkgrel=1 hunk ./source/devel-extra/twisted/FrugalBuild 9 +mirror="http://tmrc.mit.edu/mirror/twisted" hunk ./source/devel-extra/twisted/FrugalBuild 11 +# brrr i hate such circular deps +makedepends=('twisted') hunk ./source/devel-extra/twisted/FrugalBuild 15 -up2date="lynx -dump http://twistedmatrix.com/projects/core/|grep Minimal|sed 's/.*!) \([0-9\.]*\).*/\1/'" -source=(http://tmrc.mit.edu/mirror/twisted/Twisted/2.2/Twisted-$pkgver.tar.bz2) +up2date="lynx -dump $mirror/Twisted/$(lynx -dump $mirror/Twisted/|sed -n 's|.*/\(.*\)/|\1|;$ p')/|Flasttarbz2" +source=($mirror/Twisted/${pkgver%.?}/Twisted-$pkgver.tar.bz2) hunk ./source/devel-extra/twisted/FrugalBuild 18 -# optimalization OK -sha1sums=('fcce114624dfde91bc1c2358f905d3170e72ad6a') - hunk ./source/devel-extra/twisted/FrugalBuild 19 +sha1sums=('d605333f7ca3e2479a5dd31044e540ee40a54838') } [twisted-2.4.0-1-i686 VMiklos **20061202193556 added conflicts/provides/replaces twistedweb ] { hunk ./source/devel-extra/twisted/FrugalBuild 11 +# feel free to remove these after Frugalware 0.6 is out +conflicts=('twistedweb') +provides=('twistedweb') +replaces=('twistedweb') } From crazy at frugalware.org Sat Dec 2 20:50:51 2006 From: crazy at frugalware.org (crazy) Date: Sat Dec 2 20:50:55 2006 Subject: [Frugalware-darcs] frugalware-current: monodoc-1.2.1-1-i686 Message-ID: <20061202195051.8A373FA46F6@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202194702-f6986-21a5ad1b263bbf8b2494ebf9dfe6bb137b37a0b9.gz; [monodoc-1.2.1-1-i686 crazy **20061202194702 * Version bump ] { hunk ./source/gnome-extra/monodoc/FrugalBuild 5 -pkgver=1.1.18 +pkgver=1.2.1 hunk ./source/gnome-extra/monodoc/FrugalBuild 9 -depends=('gtk2-sharp' 'desktop-file-utils' 'mono>=1.1.18') +depends=('gtk2-sharp' 'desktop-file-utils' 'mono>=1.2.1') hunk ./source/gnome-extra/monodoc/FrugalBuild 16 -sha1sums=('9de7b11611c97648ab595faf6e9be1bd982be2d6') +sha1sums=('aaae643e4b166bfed6309f22af03ca8c523aa903') } From crazy at frugalware.org Sat Dec 2 21:17:34 2006 From: crazy at frugalware.org (crazy) Date: Sat Dec 2 21:17:42 2006 Subject: [Frugalware-darcs] frugalware-current: mono-tools-1.2.1-1-i686 Message-ID: <20061202201736.38050FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202201237-f6986-c0417294e02c2fb9bea0888a084c3b4b9934b3c8.gz; [mono-tools-1.2.1-1-i686 crazy **20061202201237 * Version bump ] { hunk ./source/gnome-extra/mono-tools/FrugalBuild 5 -pkgver=1.1.17 +pkgver=1.2.1 hunk ./source/gnome-extra/mono-tools/FrugalBuild 9 -depends=('gnome-sharp' 'desktop-file-utils' 'gecko-sharp' 'monodoc>=1.1.18' 'firefox') +depends=('gnome-sharp' 'desktop-file-utils' 'gecko-sharp' 'monodoc>=1.2.1' 'firefox') hunk ./source/gnome-extra/mono-tools/FrugalBuild 16 -sha1sums=('0870c83854af99e5d876e208f6f1a6ca657ce3a2') +sha1sums=('268c06497f7f914f8a83a62c068c6ae85be10d5e') } From crazy at frugalware.org Sat Dec 2 22:17:57 2006 From: crazy at frugalware.org (crazy) Date: Sat Dec 2 22:18:00 2006 Subject: [Frugalware-darcs] frugalware-current: kxgenerator-0.3.6_2-1-i686 Message-ID: <20061202211757.450E1FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202211154-f6986-95e9e236f2242fef84f914d46edb9899362b4a7c.gz; [kxgenerator-0.3.6_2-1-i686 crazy **20061202211154 * Version bump ] { hunk ./source/kde-extra/kxgenerator/FrugalBuild 5 -pkgver=0.3.6 +pkgver=0.3.6_2 hunk ./source/kde-extra/kxgenerator/FrugalBuild 13 -source=(http://dp0154.debowypark.waw.pl/kxgenerator/data/download/$pkgname-$pkgver.tar.bz2) -sha1sums=('2a63d13ab8a7fbe01d89d5d5ebf6a4cb003737b2') +up2date="$up2date|sed -e 's/-/_/' -e 's/(bug.*//g'|tr -d [:blank:]" +source=(http://dp0154.debowypark.waw.pl/$pkgname/data/download/$pkgname-`echo $pkgver|sed 's/_/-/'`.tar.bz2) +_F_cd_path="$pkgname-`echo $pkgver|sed 's/_/-/'`" +sha1sums=('73ae730cbc354ef3f2abf509b809ce5937f63ae5') } From crazy at frugalware.org Sat Dec 2 22:20:48 2006 From: crazy at frugalware.org (crazy) Date: Sat Dec 2 22:20:52 2006 Subject: [Frugalware-darcs] frugalware-current: libofa-0.9.3-2-i686 Message-ID: <20061202212048.E6199FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202211259-f6986-c02d33375b09e7acdd5284bd54d2599e17f29b64.gz; [libofa-0.9.3-2-i686 crazy **20061202211259 * url|up2date|source fix ] { hunk ./source/lib/libofa/FrugalBuild 9 -url="http://www.musicdns.org/" +url="http://www.musicip.com/" hunk ./source/lib/libofa/FrugalBuild 13 -up2date="lynx -dump http://www.musicdns.org/downloads.jsp|grep -m1 '.tar.gz$'|sed 's/.*-\(.*\).t.*/\1/'" -source=(http://www.musicdns.org/files/$pkgname-$pkgver.tar.gz gcc4.1.1-build_fix.patch) +up2date="lynx -dump http://www.musicip.com/dns/downloads.jsp|grep -m1 '.tar.gz$'|sed 's/.*-\(.*\).t.*/\1/'" +source=(http://www.musicip.com/dns/files/$pkgname-$pkgver.tar.gz gcc4.1.1-build_fix.patch) } From crazy at frugalware.org Sat Dec 2 22:41:36 2006 From: crazy at frugalware.org (crazy) Date: Sat Dec 2 22:41:40 2006 Subject: [Frugalware-darcs] frugalware-current: flac-1.1.2-4-i686 Message-ID: <20061202214137.21D06FA46F7@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202213639-f6986-6bb0d708a0f5937953bf0310850a98ae5269bb53.gz; [flac-1.1.2-4-i686 crazy **20061202213639 * up2date fix ( ohh man .. ) * anyway new flac is out WOW! :D ] { hunk ./source/multimedia/flac/FrugalBuild 8 -url="http://flac.sourceforge.net/" hunk ./source/multimedia/flac/FrugalBuild 12 -up2date="lynx -dump http://flac.sourceforge.net/download.html|grep 'full source code'|sed 's/.*C \(.*\) f.*/\1/'" +up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=13478|grep -m1 'flac-\(.*\)-src'|sed 's/.*flac-\(.*\)-src.*/\1/'" hunk ./source/multimedia/flac/FrugalBuild 24 -# vim: ft=sh - } From crazy at frugalware.org Sat Dec 2 22:41:35 2006 From: crazy at frugalware.org (crazy) Date: Sat Dec 2 22:41:42 2006 Subject: [Frugalware-darcs] frugalware-current: mp3info-0.8.4-1-i686 Message-ID: <20061202214136.2FB75FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061202212359-f6986-f7c2be82e4ec0c03d742c9c707182a38c456b5fe.gz; [mp3info-0.8.4-1-i686 crazy **20061202212359 * up2date fix ] { hunk ./source/multimedia-extra/mp3info/FrugalBuild 13 -up2date="lynx -dump http://www.ibiblio.org/mp3info/ | grep Source | sed 's/.*mp3info-\([0-9\.]\+\)\.tgz/\1/'" +up2date="lynx -dump http://www.ibiblio.org/mp3info/|grep -m1 'Source:'|sed 's/.*-\(.*\).t.*/\1/'" } From crazy at frugalware.org Sun Dec 3 04:03:42 2006 From: crazy at frugalware.org (crazy) Date: Sun Dec 3 04:03:45 2006 Subject: [Frugalware-darcs] frugalware-current: scim-m17n-0.2.2-1-i686 Message-ID: <20061203030342.DE190FA46E9@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203025539-f6986-5d6a2ad6eae8bee4a5abb7e61fd49249a93b23ee.gz; [scim-m17n-0.2.2-1-i686 crazy **20061203025539 * Version bump ] { hunk ./source/xapps-extra/scim-m17n/FrugalBuild 5 -pkgver=0.2.1 +pkgver=0.2.2 hunk ./source/xapps-extra/scim-m17n/FrugalBuild 9 +_F_sourceforge_broken_up2date=1 hunk ./source/xapps-extra/scim-m17n/FrugalBuild 12 -purl="http://sourceforge.net/project/showfiles.php?group_id=108454" hunk ./source/xapps-extra/scim-m17n/FrugalBuild 16 -up2date="lynx -dump '$purl'|grep -m1 '$pkgname-'|sed 's/.*-\(.*\).tar.gz .*/\1/'" -sha1sums=('f5a7054f403036af64dc647856c7c03e26734eb3') +sha1sums=('3294820028e1637029b3c6f9156346018953e4d5') } From krics at linuxforum.hu Sun Dec 3 15:28:48 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Dec 3 15:28:52 2006 Subject: [Frugalware-darcs] frugalware-current: pycairo-1.2.6-1-x86_64 Message-ID: <20061203142848.971F1FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203142844-d209c-c8576f9dbf5d775ecec7edf8760ccbc67570d1bb.gz; [pycairo-1.2.6-1-x86_64 Christian Hamar alias krix **20061203142844 * Version bump ] { hunk ./source/xlib/pycairo/FrugalBuild 5 -pkgver=1.2.2 -pkgrel=2 +pkgver=1.2.6 +pkgrel=1 hunk ./source/xlib/pycairo/FrugalBuild 14 -sha1sums=('ac3ccc5393ece678c2873d8807006432f616d15b') +sha1sums=('42e9ae64d2be59e46e503e52d35c71506527b3e9') hunk ./source/xlib/pycairo/FrugalBuild 17 -# optimalization OK - } From krics at linuxforum.hu Sun Dec 3 16:05:25 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Dec 3 16:05:36 2006 Subject: [Frugalware-darcs] frugalware-current: sensors-applet-1.7.10-1-x86_64 Message-ID: <20061203150526.1733CFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203150353-d209c-1b458e916c9d4708a2bc85d50cb3b5d871bb5142.gz; [sensors-applet-1.7.10-1-x86_64 Christian Hamar alias krix **20061203150353 * Version bump ] { hunk ./source/gnome-extra/sensors-applet/FrugalBuild 5 -pkgver=1.7.9 +pkgver=1.7.10 hunk ./source/gnome-extra/sensors-applet/FrugalBuild 17 -sha1sums=('e3a0a8143225a28df13a7fa43bd5c7e45d37af0f') +sha1sums=('31c7d304de2fe3959e263847e2a258cb5c74e3b9') } From krics at linuxforum.hu Sun Dec 3 16:21:48 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Dec 3 16:21:51 2006 Subject: [Frugalware-darcs] frugalware-current: libtasn1-0.3.8-1-x86_64 Message-ID: <20061203152148.4EDD2FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203152029-d209c-2cffb1e14969ad7e630d7cb0dce8f5cb594129f3.gz; [libtasn1-0.3.8-1-x86_64 Christian Hamar alias krix **20061203152029 * Version bump ] { hunk ./source/lib/libtasn1/FrugalBuild 5 -pkgver=0.3.7 +pkgver=0.3.8 hunk ./source/lib/libtasn1/FrugalBuild 15 -sha1sums=('3b742b451999f97ab564cb9c8429eb4d48816029') +sha1sums=('fe6dc6ff4673e57e0fc5a3587843583739e381d5') } From crazy at frugalware.org Sun Dec 3 17:02:24 2006 From: crazy at frugalware.org (crazy) Date: Sun Dec 3 17:02:29 2006 Subject: [Frugalware-darcs] frugalware-current: inotify-tools-3.4-1-i686 Message-ID: <20061203160224.27E2CFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203155724-f6986-33d7e5bb2548796e74cbce35dff44a4651851007.gz; [inotify-tools-3.4-1-i686 crazy **20061203155724 * Version bump ] { hunk ./source/apps-extra/inotify-tools/FrugalBuild 5 -pkgver=3.3 +pkgver=3.4 hunk ./source/apps-extra/inotify-tools/FrugalBuild 12 -sha1sums=('47b92f10e0490c2b64bff4780a0bbb606fe6e9ae') +sha1sums=('54e7506b07eb23ce1340253a0090085079dbd15f') } From krics at linuxforum.hu Sun Dec 3 17:13:27 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Dec 3 17:13:48 2006 Subject: [Frugalware-darcs] frugalware-current: frozen-bubble-2.1.0-1-x86_64 Message-ID: <20061203161329.7FF72FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203161257-d209c-4a3575dfc336ce0857f8a5aed509d321f177a81b.gz; [frozen-bubble-2.1.0-1-x86_64 Christian Hamar alias krix **20061203161257 * Version bump * Removed RTFM.patch * Added a new one :) :S ] { hunk ./source/games-extra/frozen-bubble/FrugalBuild 6 -pkgver=2.0.0 -pkgrel=3 +pkgver=2.1.0 +pkgrel=1 hunk ./source/games-extra/frozen-bubble/FrugalBuild 12 -source=(http://www.frozen-bubble.org/data/$pkgname-$pkgver.tar.bz2 $pkgname.desktop RTFM.patch) +source=(http://www.frozen-bubble.org/data/$pkgname-$pkgver.tar.bz2 $pkgname.desktop \ + use_usr.patch) hunk ./source/games-extra/frozen-bubble/FrugalBuild 19 -sha1sums=('f5b8e6e39494fe189615089cc9903dd5e0c8c292' \ - '510a01b2bad0b69ed383569e967bb10b53909f97' \ - '6bdaac35008bdd9e6b480c0fb69c731fe7b3b8a2') +sha1sums=('4fa45612e430f65d996b89959fdfbda9d629eb3e' \ + '510a01b2bad0b69ed383569e967bb10b53909f97' \ + '03460c83a6679fc5756af428f29212c3a4380464') hunk ./source/games-extra/frozen-bubble/FrugalBuild 23 -build() -{ +build() { hunk ./source/games-extra/frozen-bubble/FrugalBuild 40 - hunk ./source/games-extra/frozen-bubble/RTFM.patch 1 -diff -Naurp frozen-bubble-2.0.0/Makefile frozen-bubble-2.0.0-p/Makefile ---- frozen-bubble-2.0.0/Makefile 2006-10-05 21:39:10.000000000 +0200 -+++ frozen-bubble-2.0.0-p/Makefile 2006-10-28 14:51:35.000000000 +0200 -@@ -1,6 +1,6 @@ - DIRS = c_stuff po server - --PREFIX = /usr/local -+PREFIX = /usr - DATADIR = $(PREFIX)/share - LIBDIR = $(PREFIX)/lib - BINDIR = $(PREFIX)/bin -diff -Naurp frozen-bubble-2.0.0/po/Makefile frozen-bubble-2.0.0-p/po/Makefile ---- frozen-bubble-2.0.0/po/Makefile 2006-10-26 21:26:24.000000000 +0200 -+++ frozen-bubble-2.0.0-p/po/Makefile 2006-10-28 14:51:35.000000000 +0200 -@@ -1,4 +1,4 @@ --PREFIX = /usr/local -+PREFIX = /usr - DATADIR = $(PREFIX)/share - LOCALEDIR = $(DATADIR)/locale - -diff -Naurp frozen-bubble-2.0.0/server/Makefile frozen-bubble-2.0.0-p/server/Makefile ---- frozen-bubble-2.0.0/server/Makefile 2006-10-26 20:42:48.000000000 +0200 -+++ frozen-bubble-2.0.0-p/server/Makefile 2006-10-28 14:52:19.000000000 +0200 -@@ -1,8 +1,8 @@ --PREFIX = /usr/local -+PREFIX = /usr - LIBDIR = $(PREFIX)/lib - --CFLAGS ?= -g -Wall -Werror -pipe `pkg-config glib-2.0 --cflags` --LIBS ?= `pkg-config glib-2.0 --libs` -+CFLAGS += -g -Wall -pipe `pkg-config glib-2.0 --cflags` -+LIBS += `pkg-config glib-2.0 --libs` - - ALLSRC = fb-server.c log.c tools.c game.c net.c - ALLOBJ = $(subst .c,.o,$(ALLSRC)) rmfile ./source/games-extra/frozen-bubble/RTFM.patch addfile ./source/games-extra/frozen-bubble/use_usr.patch hunk ./source/games-extra/frozen-bubble/use_usr.patch 1 +diff -Naur frozen-bubble-2.1.0/settings.mk frozen-bubble-2.1.0-p/settings.mk +--- frozen-bubble-2.1.0/settings.mk 2006-11-12 20:56:02.000000000 +0100 ++++ frozen-bubble-2.1.0-p/settings.mk 2006-12-03 16:37:58.000000000 +0100 +@@ -1,4 +1,4 @@ +-PREFIX = /usr/local ++PREFIX = /usr + DATADIR = $(PREFIX)/share + LIBDIR = $(PREFIX)/lib + BINDIR = $(PREFIX)/bin } From krics at linuxforum.hu Sun Dec 3 17:49:17 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Dec 3 17:49:23 2006 Subject: [Frugalware-darcs] frugalware-current: perl-io-socket-ssl-1.02-1-x86_64 Message-ID: <20061203164918.29771FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203164918-d209c-e322de784a151580f608d2b595fa94d47d75baa3.gz; [perl-io-socket-ssl-1.02-1-x86_64 Christian Hamar alias krix **20061203164918 * Version bump ] { hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 6 -pkgver=1.01 +pkgver=1.02 hunk ./source/devel/perl-io-socket-ssl/FrugalBuild 14 -sha1sums=('3f259882401aa59120a2aebd16070b147487faca') +sha1sums=('49dc941bffbe2e7dc08e7424a43b330eb1bef69d') } From krics at linuxforum.hu Sun Dec 3 17:58:47 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Dec 3 17:58:57 2006 Subject: [Frugalware-darcs] frugalware-current: gammu-1.09.00-1-x86_64 Message-ID: <20061203165848.3B594FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203165819-d209c-bd72c0e86e9d57f2b317b460e732bf80ccf1a9e7.gz; [gammu-1.09.00-1-x86_64 Christian Hamar alias krix **20061203165819 * Version bump ] { hunk ./source/apps-extra/gammu/FrugalBuild 5 -pkgver=1.08.00 +pkgver=1.09.00 hunk ./source/apps-extra/gammu/FrugalBuild 17 -sha1sums=('798cf7c58443db7f73c1c70cb5a2c5332ebadf36') +sha1sums=('6d740b383b38ec1176aac6e569b68fd67d149374') } From krics at linuxforum.hu Sun Dec 3 18:15:13 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Sun Dec 3 18:15:29 2006 Subject: [Frugalware-darcs] frugalware-current: medit-0.8.0-1-x86_64 Message-ID: <20061203171513.43CB2FA4702@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203171220-d209c-d8a7d71d69652786e18d387e251bf2fc53087528.gz; [medit-0.8.0-1-x86_64 Christian Hamar alias krix **20061203171220 * Version bump ] { hunk ./source/xapps-extra/medit/FrugalBuild 6 -pkgver=0.7.96 +pkgver=0.8.0 hunk ./source/xapps-extra/medit/FrugalBuild 18 +sha1sums=('d9b988db9966f7ec1b5d3366926d5151d8483ae4') hunk ./source/xapps-extra/medit/FrugalBuild 21 -sha1sums=('03558d0796b330061efc5654b068a71959372fa4') } From crazy at frugalware.org Sun Dec 3 18:52:06 2006 From: crazy at frugalware.org (crazy) Date: Sun Dec 3 18:52:10 2006 Subject: [Frugalware-darcs] frugalware-current: wine-0.9.26-1-i686 Message-ID: <20061203175206.45F6BFA4706@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203174815-f6986-b6c1a1e95cd5f3511ddfc5d7bb82b048ea1f6f3c.gz; [wine-0.9.26-1-i686 crazy **20061203174815 * Version bump ] { hunk ./source/xapps/wine/FrugalBuild 6 -pkgver=0.9.25 +pkgver=0.9.26 hunk ./source/xapps/wine/FrugalBuild 15 -makedepends=('flex' 'bison') +makedepends=('flex' 'bison' 'fontforge') hunk ./source/xapps/wine/FrugalBuild 21 +sha1sums=('fc5cc0f14df7db577ffbf0deb452b4a379963abf' \ + '791f98451f0c6a8a624af63de96f6d7ea0303e63' \ + 'da1f0ea2ee88a96d8bd255605abc16636564fd63' \ + '225de768810fc6439896b8274b2f5332cf91fc01') hunk ./source/xapps/wine/FrugalBuild 28 - Fconf --enable-opengl --disable-debug --disable-trace - make depend || return 1 - make || return 1 - Fmakeinstall + Fbuild --enable-opengl --disable-debug --disable-trace + #make depend || return 1 + #make || return 1 + #Fmakeinstall hunk ./source/xapps/wine/FrugalBuild 36 -sha1sums=('bdfac6530616d69bee305ed4c5bc6c41f424be7a' \ - '791f98451f0c6a8a624af63de96f6d7ea0303e63' \ - 'da1f0ea2ee88a96d8bd255605abc16636564fd63' \ - '225de768810fc6439896b8274b2f5332cf91fc01') } From vmiklos at frugalware.org Sun Dec 3 19:21:27 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Dec 3 19:21:31 2006 Subject: [Frugalware-darcs] frugalware-current: kernel-2.6.19-1-i686 Message-ID: <20061203182128.0EE85FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203181516-e2957-8286a2f54dcbc31cd30a581644b9448987affdfd.gz; [kernel-2.6.19-1-i686 VMiklos **20061203181516 added fwh_detect.diff to silence a warning on bootup on some intel machines ] { hunk ./source/base/kernel/FrugalBuild 9 -_F_kernel_patches=(c28728decc37fe52c8cdf48b3e0c0cf9b0c2fefb.diff) +_F_kernel_patches=(c28728decc37fe52c8cdf48b3e0c0cf9b0c2fefb.diff fwh_detect.diff) addfile ./source/base/kernel/fwh_detect.diff hunk ./source/base/kernel/fwh_detect.diff 1 +=================================================================== +--- head-2006-11-21.orig/drivers/char/hw_random/intel-rng.c 2006-11-21 10:36:15.000000000 +0100 ++++ head-2006-11-21/drivers/char/hw_random/intel-rng.c 2006-11-29 09:09:21.000000000 +0100 +@@ -143,6 +143,8 @@ static const struct pci_device_id pci_tb + }; + MODULE_DEVICE_TABLE(pci, pci_tbl); + ++static __initdata int no_fwh_detect; ++module_param(no_fwh_detect, int, 0); + + static inline u8 hwstatus_get(void __iomem *mem) + { +@@ -240,6 +242,11 @@ static int __init mod_init(void) + if (!dev) + goto out; /* Device not found. */ + ++ if (no_fwh_detect < 0) { ++ pci_dev_put(dev); ++ goto fwh_done; ++ } ++ + /* Check for Intel 82802 */ + if (dev->device < 0x2640) { + fwh_dec_en1_off = FWH_DEC_EN1_REG_OLD; +@@ -252,6 +259,23 @@ static int __init mod_init(void) + pci_read_config_byte(dev, fwh_dec_en1_off, &fwh_dec_en1_val); + pci_read_config_byte(dev, bios_cntl_off, &bios_cntl_val); + ++ if ((bios_cntl_val & ++ (BIOS_CNTL_LOCK_ENABLE_MASK|BIOS_CNTL_WRITE_ENABLE_MASK)) ++ == BIOS_CNTL_LOCK_ENABLE_MASK) { ++ static __initdata /*const*/ char warning[] = ++ KERN_WARNING PFX "Firmware space is locked read-only. If you can't or\n" ++ KERN_WARNING PFX "don't want to disable this in firmware setup, and if\n" ++ KERN_WARNING PFX "you are certain that your system has a functional\n" ++ KERN_WARNING PFX "RNG, try using the 'no_fwh_detect' option.\n"; ++ ++ pci_dev_put(dev); ++ if (no_fwh_detect) ++ goto fwh_done; ++ printk(warning); ++ err = -EBUSY; ++ goto out; ++ } ++ + mem = ioremap_nocache(INTEL_FWH_ADDR, INTEL_FWH_ADDR_LEN); + if (mem == NULL) { + pci_dev_put(dev); +@@ -280,8 +304,7 @@ static int __init mod_init(void) + pci_write_config_byte(dev, + fwh_dec_en1_off, + fwh_dec_en1_val | FWH_F8_EN_MASK); +- if (!(bios_cntl_val & +- (BIOS_CNTL_LOCK_ENABLE_MASK|BIOS_CNTL_WRITE_ENABLE_MASK))) ++ if (!(bios_cntl_val & BIOS_CNTL_WRITE_ENABLE_MASK)) + pci_write_config_byte(dev, + bios_cntl_off, + bios_cntl_val | BIOS_CNTL_WRITE_ENABLE_MASK); +@@ -315,6 +338,8 @@ static int __init mod_init(void) + goto out; + } + ++fwh_done: ++ + err = -ENOMEM; + mem = ioremap(INTEL_RNG_ADDR, INTEL_RNG_ADDR_LEN); + if (!mem) + } From vmiklos at frugalware.org Sun Dec 3 19:35:43 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Dec 3 19:35:46 2006 Subject: [Frugalware-darcs] frugalware-current: j2re-5.0_10-1-i686 Message-ID: <20061203183543.88A40FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203182714-e2957-130c9ecdc0143a73e00012cb775ecad0e384f2ef.gz; [j2re-5.0_10-1-i686 VMiklos **20061203182714 sha1sums() fix on i686 ] { hunk ./source/apps/j2re/FrugalBuild 17 - sha1sums=('28152c0f2a1c1793b4aea4d523e89126a764307d') + sha1sums=('fc4883d6da60940cbe4b6c2575478cead26313ff') hunk ./source/apps/j2re/FrugalBuild 25 -sha1sums=(${sha1sums[@]} 'd7b32de18152a3ad4d520563c9f847eb864bfbc9') +sha1sums=(${sha1sums[@]} '966b9c8229ef3dfb588c108124f367cc993cb581' \ + 'd7b32de18152a3ad4d520563c9f847eb864bfbc9') hunk ./source/apps/j2re/FrugalBuild 46 -sha1sums=('fc4883d6da60940cbe4b6c2575478cead26313ff' \ - '966b9c8229ef3dfb588c108124f367cc993cb581' \ - 'd7b32de18152a3ad4d520563c9f847eb864bfbc9') - } From vmiklos at frugalware.org Sun Dec 3 19:45:12 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Dec 3 19:45:16 2006 Subject: [Frugalware-darcs] frugalware-current: bittorrent-5.0.1-1-i686 Message-ID: <20061203184513.34A40FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203183953-e2957-47df8a81c48e63be0a4eb11ac6818ef93bd7ff2c.gz; [bittorrent-5.0.1-1-i686 VMiklos **20061203183953 depends() fix ] { hunk ./source/network-extra/bittorrent/FrugalBuild 10 -depends=('twistedweb') +depends=('twisted>=2.4.0') } From crazy at frugalware.org Sun Dec 3 19:49:57 2006 From: crazy at frugalware.org (crazy) Date: Sun Dec 3 19:50:01 2006 Subject: [Frugalware-darcs] frugalware-current: fltk2-r5553-1-i686 Message-ID: <20061203184958.35A75FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203184542-f6986-830f7f37a1555d6eb8d392ac99f241b2dfd66ff4.gz; [fltk2-r5553-1-i686 crazy **20061203184542 * Version bump ] { hunk ./source/xlib/fltk2/FrugalBuild 5 -pkgver=r5547 +pkgver=r5553 hunk ./source/xlib/fltk2/FrugalBuild 16 -source=(http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/snapshots/$origname.tar.bz2 \ +source=(ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/$origname.tar.bz2 \ hunk ./source/xlib/fltk2/FrugalBuild 18 -sha1sums=('8973acef107ebc1d53655e5971b2956cf9470527' \ +sha1sums=('a050d940aa7809dd2f7046cb5b3baf8a300ac908' \ hunk ./source/xlib/fltk2/FrugalBuild 22 + } From crazy at frugalware.org Sun Dec 3 20:04:06 2006 From: crazy at frugalware.org (crazy) Date: Sun Dec 3 20:04:11 2006 Subject: [Frugalware-darcs] frugalware-current: gxmms2-0.6.4-1-i686 Message-ID: <20061203190406.CD311FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203185616-f6986-4b45a5ad418dbbd046b85fdee3a764afa95ce8e4.gz; [gxmms2-0.6.4-1-i686 crazy **20061203185616 * up2date fix ] { hunk ./source/xmultimedia-extra/gxmms2/FrugalBuild 13 -up2date="lynx -dump http://wejp.k.vu/projects/xmms2/ | grep -m1 tar.gz$ | sed -n 's/.*-\(.*\).t.*/\1/;$ p'" +up2date="lynx -dump http://wejp.k.vu/projects/xmms2/|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).tar.gz.*/\1/'" } From crazy at frugalware.org Sun Dec 3 20:04:06 2006 From: crazy at frugalware.org (crazy) Date: Sun Dec 3 20:04:13 2006 Subject: [Frugalware-darcs] frugalware-current: cegui-0.4.1-1-i686 Message-ID: <20061203190407.4D92EFA4702@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203185219-f6986-c3f6466ecfb08c08f1d0ce3ee4dd258ed2563683.gz; [cegui-0.4.1-1-i686 crazy **20061203185219 * up2date fix ] { hunk ./source/xlib-extra/cegui/FrugalBuild 15 -up2date="lynx -dump $url/wiki/index.php/Downloads | grep -m1 stable | sed 's/.*s \(.*\).:.*/\1/'" } From alex at alex-smith.me.uk Sun Dec 3 20:04:43 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Dec 3 20:04:46 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-session-2.17.3-1-i686 Message-ID: <20061203190443.D5089FA4701@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203190248-46e39-64c3203195fb0794d882128017bdf9a8c2a65479.gz; [gnome-session-2.17.3-1-i686 AlexExtreme **20061203190248 * Version bump * Added some fancy little hacks for using the Desktop Effects control panel from Fedora (will be added later) ] { hunk ./source/gnome/gnome-session/FrugalBuild 7 -pkgver=2.17.2 -pkgrel=2 +pkgver=2.17.3 +pkgrel=1 hunk ./source/gnome/gnome-session/FrugalBuild 22 - 21_dont_grab_when_composited.patch) -sha1sums=('03258fc27f32777c9760fb5b2864d1de1d098320' \ + 21_dont_grab_when_composited.patch \ + gnome-session-2.17.3-fix-compiz-invocation.patch) +sha1sums=('124ef5be34889e1b01f7e192529926e1a3e51478' \ hunk ./source/gnome/gnome-session/FrugalBuild 26 - '4fab1a4ac8315de2f80a3e942cfdc35a9eb6edb2' \ + 'cde258937505af49a68f235749584ab8fed78693' \ hunk ./source/gnome/gnome-session/FrugalBuild 31 - 'c96f814d29ae8805ee27852da795b489928e8d3c') + 'c96f814d29ae8805ee27852da795b489928e8d3c' \ + 'b401c7975579d9d68101a248c936741c158f6068') hunk ./source/gnome/gnome-session/gnome-session 10 -if [ -x "/usr/bin/compiz-gnome" ]; then - /usr/bin/compiz-gnome +# Hack for desktop-effects +if [ -x "/usr/bin/compiz" ]; then + GCONF_WM=$(gconftool-2 --get /apps/gnome-session/frugalware/window_manager 2>&1) + GCONF_WM=$(basename ${GCONF_WM}) + if [ "$GCONF_WM" = "compiz" ]; then + export WINDOW_MANAGER="/usr/bin/compiz" + fi addfile ./source/gnome/gnome-session/gnome-session-2.17.3-fix-compiz-invocation.patch hunk ./source/gnome/gnome-session/gnome-session-2.17.3-fix-compiz-invocation.patch 1 +diff -urN gnome-session-2.17.3.orig/gnome-session/gnome-wm gnome-session-2.17.3/gnome-session/gnome-wm +--- gnome-session-2.17.3.orig/gnome-session/gnome-wm 2006-12-03 18:27:22.000000000 +0000 ++++ gnome-session-2.17.3/gnome-session/gnome-wm 2006-12-03 18:28:53.000000000 +0000 +@@ -113,11 +113,12 @@ + + case `basename $WINDOW_MANAGER` in + compiz) +- gnome-window-decorator & +- OPT3=gconf ++ gtk-window-decorator & ++ OPT3=--use-cow ++ OPT4=gconf + ;; + esac + +-exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 ++exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4 + + echo "ERROR: No window manager could run!" } From crazy at frugalware.org Sun Dec 3 21:01:55 2006 From: crazy at frugalware.org (crazy) Date: Sun Dec 3 21:01:59 2006 Subject: [Frugalware-darcs] frugalware-current: wine-0.9.26-1-i686 Message-ID: <20061203200155.C915FFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203195650-f6986-ca93e44784bca6cf552b43459488dbad15985b99.gz; [wine-0.9.26-1-i686 crazy **20061203195650 * fix init script ] { hunk ./source/xapps/wine/FrugalBuild 22 - '791f98451f0c6a8a624af63de96f6d7ea0303e63' \ + '4034515b072dbd948096320def5ac5b017ed562a' \ hunk ./source/xapps/wine/FrugalBuild 26 + hunk ./source/xapps/wine/rc.wine 31 - echo ':wine:E::exe::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register + echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register + echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register hunk ./source/xapps/wine/rc.wine 41 - echo '-1' > /proc/sys/fs/binfmt_misc/wine + echo "-1" >/proc/sys/fs/binfmt_misc/windows + echo "-1" >/proc/sys/fs/binfmt_misc/windowsPE } From alex at alex-smith.me.uk Sun Dec 3 21:20:39 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Dec 3 21:20:42 2006 Subject: [Frugalware-darcs] frugalware-current: gset-compiz-0.3.3-2-i686 Message-ID: <20061203202039.B1EBEFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203202022-46e39-5863d71939ab6248095f36af1e0d450851314fa6.gz; [gset-compiz-0.3.3-2-i686 AlexExtreme **20061203202022 * Release bump * Depend on compiz, not compiz-cvs ] { hunk ./source/xapps-extra/gset-compiz/FrugalBuild 8 -pkgrel=1 +pkgrel=2 hunk ./source/xapps-extra/gset-compiz/FrugalBuild 11 -depends=('compiz-cvs') +depends=('compiz') hunk ./source/xapps-extra/gset-compiz/FrugalBuild 18 -Finclude gnome-scriptlet hunk ./source/xapps-extra/gset-compiz/FrugalBuild 19 +Finclude gnome-scriptlet } From vmiklos at frugalware.org Sun Dec 3 21:24:05 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Dec 3 21:24:08 2006 Subject: [Frugalware-darcs] frugalware-current: kernel-2.6.19-1-i686 Message-ID: <20061203202405.506CBFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203202149-e2957-714359730f88ac297b992f9d1705c6181164c35b.gz; [kernel-2.6.19-1-i686 VMiklos **20061203202149 a better version of the ipv6 oops fix ] { move ./source/base/kernel/c28728decc37fe52c8cdf48b3e0c0cf9b0c2fefb.diff ./source/base/kernel/6e38433357e2381bb278a418fb7e2fd201475101.diff hunk ./source/base/kernel/6e38433357e2381bb278a418fb7e2fd201475101.diff 1 +From linux-kernel-owner+nix.or.die=40googlemail.com-S1424952AbWLCFCJ@vger.kernel.org Sun Dec 3 06:03:47 2006 +X-Account-Key: account6 +Delivered-To: nix.or.die@gmail.com +Received: by 10.48.230.3 with SMTP id c3cs191782nfh; + Sat, 2 Dec 2006 21:03:47 -0800 (PST) +Received: by 10.90.31.19 with SMTP id e19mr6638826age.1165122227156; + Sat, 02 Dec 2006 21:03:47 -0800 (PST) +Return-Path: +Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) + by mx.google.com with ESMTP id 6si5380005agb.2006.12.02.21.03.46; + Sat, 02 Dec 2006 21:03:47 -0800 (PST) +Received-SPF: pass (google.com: domain of linux-kernel-owner+nix.or.die=40googlemail.com-S1424952AbWLCFCJ@vger.kernel.org designates 209.132.176.167 as permitted sender) +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S1424952AbWLCFCJ (ORCPT ); + Sun, 3 Dec 2006 00:02:09 -0500 +Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1424951AbWLCFCJ + (ORCPT ); + Sun, 3 Dec 2006 00:02:09 -0500 +Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:50101 + "EHLO sunset.davemloft.net") by vger.kernel.org with ESMTP + id S1424950AbWLCFCI (ORCPT ); + Sun, 3 Dec 2006 00:02:08 -0500 +Received: from localhost (localhost [127.0.0.1]) + by sunset.davemloft.net (Postfix) with ESMTP id 22D49AE4697; + Sat, 2 Dec 2006 21:02:13 -0800 (PST) +Date: Sat, 02 Dec 2006 21:02:12 -0800 (PST) +Message-Id: <20061202.210212.104031085.davem@davemloft.net> +To: akpm@osdl.org +Cc: bugme-daemon@bugzilla.kernel.org, netdev@vger.kernel.org, + jasmin-bugs@pacifica.ch, linux-kernel@vger.kernel.org +Subject: Re: [Bugme-new] [Bug 7621] New: 2.6.19 breaks IPv6 +From: David Miller +In-Reply-To: <20061202192009.05277ebf.akpm@osdl.org> +References: <200612021923.kB2JNsLw018910@fire-2.osdl.org> + <20061202192009.05277ebf.akpm@osdl.org> +X-Mailer: Mew version 4.2 on Emacs 21.4 / Mule 5.0 (SAKAKI) +Mime-Version: 1.0 +Content-Type: Text/Plain; charset=us-ascii +Content-Transfer-Encoding: 7bit +Sender: linux-kernel-owner@vger.kernel.org +Precedence: bulk +X-Mailing-List: linux-kernel@vger.kernel.org +Status: RO + +From: Andrew Morton +Date: Sat, 2 Dec 2006 19:20:09 -0800 + +> > On Sat, 2 Dec 2006 11:23:54 -0800 bugme-daemon@bugzilla.kernel.org wrote: +> > http://bugzilla.kernel.org/show_bug.cgi?id=7621 +> > +> > Summary: 2.6.19 breaks IPv6 +> > Kernel Version: 2.6.19 +> > Status: NEW +> > Severity: high +> > Owner: yoshfuji@linux-ipv6.org +> > Submitter: jasmin-bugs@pacifica.ch +> > +> > +> > Vanille 2.6.19 oops'es at boot. With the patch from +> > http://marc.theaimsgroup.com/?l=linux-kernel&m=116485303623545&w=2 it boots +> > but IPv6 stopps working. I can't ping/traceroute any host. Network setup has +> > not changed. +> > +> > ------- You are receiving this mail because: ------- +> > You are on the CC list for the bug, or are watching someone who is. + +As YOSHIFUJI Hideaki noticed, changing 'len' influences the +argument to ip6_nd_hdr(), which is not a side effect we wanted. + +We only wanted the allocation length to be increased by +sizeof(struct ipv6hdr). + +This is the correct version of the fix. + +commit 6e38433357e2381bb278a418fb7e2fd201475101 +Author: David S. Miller +Date: Sat Dec 2 21:00:06 2006 -0800 + + [IPV6] NDISC: Calculate packet length correctly for allocation. + + MAX_HEADER does not include the ipv6 header length in it, + so we need to add it in explicitly. + + With help from YOSHIFUJI Hideaki. + + Signed-off-by: David S. Miller + hunk ./source/base/kernel/6e38433357e2381bb278a418fb7e2fd201475101.diff 89 -index 73eb8c3..c42d4c2 100644 +index 73eb8c3..89d527e 100644 hunk ./source/base/kernel/6e38433357e2381bb278a418fb7e2fd201475101.diff 92 -@@ -441,7 +441,8 @@ static void ndisc_send_na(struct net_dev - struct sk_buff *skb; - int err; +@@ -472,7 +472,9 @@ static void ndisc_send_na(struct net_dev + inc_opt = 0; + } hunk ./source/base/kernel/6e38433357e2381bb278a418fb7e2fd201475101.diff 96 -- len = sizeof(struct icmp6hdr) + sizeof(struct in6_addr); -+ len = sizeof(struct ipv6hdr) + sizeof(struct icmp6hdr) + -+ sizeof(struct in6_addr); +- skb = sock_alloc_send_skb(sk, MAX_HEADER + len + LL_RESERVED_SPACE(dev), ++ skb = sock_alloc_send_skb(sk, ++ (MAX_HEADER + sizeof(struct ipv6hdr) + ++ len + LL_RESERVED_SPACE(dev)), + 1, &err); hunk ./source/base/kernel/6e38433357e2381bb278a418fb7e2fd201475101.diff 102 - /* for anycast or proxy, solicited_addr != src_addr */ - ifp = ipv6_get_ifaddr(solicited_addr, dev, 1); -@@ -556,7 +557,8 @@ void ndisc_send_ns(struct net_device *de - if (err < 0) - return; - -- len = sizeof(struct icmp6hdr) + sizeof(struct in6_addr); -+ len = sizeof(struct ipv6hdr) + sizeof(struct icmp6hdr) + -+ sizeof(struct in6_addr); - send_llinfo = dev->addr_len && !ipv6_addr_any(saddr); + if (skb == NULL) { +@@ -561,7 +563,9 @@ void ndisc_send_ns(struct net_device *de hunk ./source/base/kernel/6e38433357e2381bb278a418fb7e2fd201475101.diff 106 -@@ -632,7 +634,7 @@ void ndisc_send_rs(struct net_device *de - if (err < 0) - return; hunk ./source/base/kernel/6e38433357e2381bb278a418fb7e2fd201475101.diff 107 -- len = sizeof(struct icmp6hdr); -+ len = sizeof(struct ipv6hdr) + sizeof(struct icmp6hdr); +- skb = sock_alloc_send_skb(sk, MAX_HEADER + len + LL_RESERVED_SPACE(dev), ++ skb = sock_alloc_send_skb(sk, ++ (MAX_HEADER + sizeof(struct ipv6hdr) + ++ len + LL_RESERVED_SPACE(dev)), + 1, &err); + if (skb == NULL) { + ND_PRINTK0(KERN_ERR +@@ -636,7 +640,9 @@ void ndisc_send_rs(struct net_device *de hunk ./source/base/kernel/6e38433357e2381bb278a418fb7e2fd201475101.diff 118 -@@ -1381,7 +1383,8 @@ void ndisc_send_redirect(struct sk_buff - struct in6_addr *target) - { - struct sock *sk = ndisc_socket->sk; -- int len = sizeof(struct icmp6hdr) + 2 * sizeof(struct in6_addr); -+ int len = sizeof(struct ipv6hdr) + sizeof(struct icmp6hdr) + -+ 2 * sizeof(struct in6_addr); - struct sk_buff *buff; - struct icmp6hdr *icmph; - struct in6_addr saddr_buf; +- skb = sock_alloc_send_skb(sk, MAX_HEADER + len + LL_RESERVED_SPACE(dev), ++ skb = sock_alloc_send_skb(sk, ++ (MAX_HEADER + sizeof(struct ipv6hdr) + ++ len + LL_RESERVED_SPACE(dev)), + 1, &err); + if (skb == NULL) { + ND_PRINTK0(KERN_ERR +@@ -1446,7 +1452,9 @@ void ndisc_send_redirect(struct sk_buff + rd_len &= ~0x7; + len += rd_len; + +- buff = sock_alloc_send_skb(sk, MAX_HEADER + len + LL_RESERVED_SPACE(dev), ++ buff = sock_alloc_send_skb(sk, ++ (MAX_HEADER + sizeof(struct ipv6hdr) + ++ len + LL_RESERVED_SPACE(dev)), + 1, &err); + if (buff == NULL) { + ND_PRINTK0(KERN_ERR hunk ./source/base/kernel/FrugalBuild 9 -_F_kernel_patches=(c28728decc37fe52c8cdf48b3e0c0cf9b0c2fefb.diff fwh_detect.diff) +_F_kernel_patches=(6e38433357e2381bb278a418fb7e2fd201475101.diff fwh_detect.diff) } From alex at alex-smith.me.uk Sun Dec 3 22:00:56 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Sun Dec 3 22:01:02 2006 Subject: [Frugalware-darcs] frugalware-current: dhcpcd-3.0.2-1-i686 Message-ID: <20061203210056.BC174FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203205827-46e39-cca2fa3139934f3f44c430fe07c093917c1fcc42.gz; [dhcpcd-3.0.2-1-i686 AlexExtreme **20061203205827 * Version bump - we never noticed that 1.x was discontinued by it's author and continued by a Gentoo devel :) * Added patch to fix build with Linux 2.6.19 * Added patch to make it use old paths to retain compability with our tools * Added patch to dhcpcd.sh to not log to the console ] { hunk ./source/base/dhcpcd/FrugalBuild 6 -pkgver=1.3.22pl4 -origver=`echo $pkgver|sed 's/p/-p/'` -pkgrel=4 +pkgver=3.0.2 +pkgrel=1 hunk ./source/base/dhcpcd/FrugalBuild 9 -url="http://www.phystech.com/download/dhcpcd.html" +url="http://dhcpcd.berlios.de" hunk ./source/base/dhcpcd/FrugalBuild 15 -up2date="lynx -dump 'http://www.phystech.com/ftp/?M=D'|grep dhcp.*tar.gz$|sed -n -e 's/.*d-\(.*\)\.t.*/\1/' -e 's/-//' -e '1 p'" -source=(http://www.phystech.com/ftp/$pkgname-$origver.tar.gz \ - dhcpcd-1.3.22pl4-CAN_2005_1848.diff) -sha1sums=('bf5cbe68fbadd5597a1ccbf78848af5beff4b6e6' \ - '7871f21df5d9dc0e395d13d5192412b8ae00b174') +_F_berlios_ext=".tar.bz2" +Finclude berlios +source=(${source[@]} dhcpcd-3.0.2-linux2619.patch \ + dhcpcd-3.0.2-use_old_paths.patch \ + dhcpcd-3.0.2-dont-log-to-stdout.patch) +up2date="lynx -dump http://dhcpcd.berlios.de/ | Flasttarbz2" +sha1sums=('9d01ae3d13690006c91f2cebd6eddcf374120324' \ + 'a53e1fa36e82a411b17467e08cce9be2f75ea2a8' \ + '4e52080a0bf5f30fac47777ef662d9f65b30268e' \ + '171e1b8bffe2b9c12744029cb516d7c245c8770b') hunk ./source/base/dhcpcd/FrugalBuild 26 -build() -{ - Fcd $pkgname-$origver - [ "$CARCH" == "x86_64" ] && Fautoconfize - Fbuild - Fmkdir /sbin - Fmv /usr/sbin/dhcpcd /sbin +build() { + Fcd + Fpatchall + Fmake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" + Fmakeinstall + Fmkdir /etc/dhcpc + Fexerel dhcpcd.sh /etc/dhcpcd.sh hunk ./source/base/dhcpcd/dhcpcd-1.3.22pl4-CAN_2005_1848.diff 1 ---- dhcpcd-1.3.22-pl4.orig/client.c.orig 2002-12-31 17:24:37.000000000 -0800 -+++ dhcpcd-1.3.22-pl4/client.c 2005-09-11 16:27:13.000000000 -0700 -@@ -128,6 +128,9 @@ - default: - if ( p[1] ) - { -+ if ( p + 2 + p[1] >= end ) /* fix for CAN-2005-1848 */ -+ goto swend; -+ - if ( DhcpOptions.len[*p] == p[1] ) - memcpy(DhcpOptions.val[*p],p+2,p[1]); - else rmfile ./source/base/dhcpcd/dhcpcd-1.3.22pl4-CAN_2005_1848.diff addfile ./source/base/dhcpcd/dhcpcd-3.0.2-dont-log-to-stdout.patch hunk ./source/base/dhcpcd/dhcpcd-3.0.2-dont-log-to-stdout.patch 1 +diff -urN dhcpcd-3.0.2.orig/dhcpcd.sh dhcpcd-3.0.2/dhcpcd.sh +--- dhcpcd-3.0.2.orig/dhcpcd.sh 2006-12-03 20:52:22.000000000 +0000 ++++ dhcpcd-3.0.2/dhcpcd.sh 2006-12-03 20:52:40.000000000 +0000 +@@ -25,20 +25,20 @@ + + case "${state}" in + up) +- logger -s -p local0.info -t dhcpcd.sh \ ++ logger -p local0.info -t dhcpcd.sh \ + "interface ${INTERFACE} has been configured with old IP=${IPADDR}" + # Put your code here for when the interface has been brought up with an + # old IP address here + ;; + + new) +- logger -s -p local0.info -t dhcpcd.sh \ ++ logger -p local0.info -t dhcpcd.sh \ + "interface ${INTERFACE} has been configured with new IP=${IPADDR}" + # Put your code here for when the interface has been brought up with a + # new IP address + ;; + +- down) logger -s -p local0.info -t dhcpcd.sh \ ++ down) logger -p local0.info -t dhcpcd.sh \ + "interface ${INTERFACE} has been brought down" + # Put your code here for the when the interface has been shut down + ;; addfile ./source/base/dhcpcd/dhcpcd-3.0.2-linux2619.patch hunk ./source/base/dhcpcd/dhcpcd-3.0.2-linux2619.patch 1 +diff -urN dhcpcd-3.0.2.orig/interface.c dhcpcd-3.0.2/interface.c +--- dhcpcd-3.0.2.orig/interface.c 2006-12-03 20:32:08.000000000 +0000 ++++ dhcpcd-3.0.2/interface.c 2006-12-03 20:32:20.000000000 +0000 +@@ -47,6 +47,7 @@ + #define HAVE_IFADDRS_H + #include + #endif ++#include + + #include + #include addfile ./source/base/dhcpcd/dhcpcd-3.0.2-use_old_paths.patch hunk ./source/base/dhcpcd/dhcpcd-3.0.2-use_old_paths.patch 1 +diff -urN dhcpcd-3.0.2.orig/pathnames.h dhcpcd-3.0.2/pathnames.h +--- dhcpcd-3.0.2.orig/pathnames.h 2006-12-03 20:32:08.000000000 +0000 ++++ dhcpcd-3.0.2/pathnames.h 2006-12-03 20:35:51.000000000 +0000 +@@ -32,10 +32,10 @@ + #define DEFAULT_SCRIPT ETCDIR "/" PACKAGE ".sh" + + #define STATEDIR "/var" +-#define PIDFILE STATEDIR "/run/" PACKAGE "-%s.pid" ++#define PIDFILE ETCDIR "/dhcpc/" PACKAGE "-%s.pid" + +-#define CONFIGDIR STATEDIR "/lib/" PACKAGE +-#define INFOFILE CONFIGDIR "/" PACKAGE "-%s.info" ++#define CONFIGDIR ETCDIR "/dhcpc" ++#define INFOFILE ETCDIR "/dhcpc/" PACKAGE "-%s.info" + + #define NTPLOGFILE "/var/log/ntp.log" + } From boobaa at frugalware.org Sun Dec 3 22:05:59 2006 From: boobaa at frugalware.org (CSÉCSY László) Date: Sun Dec 3 22:06:03 2006 Subject: [Frugalware-darcs] frugalware-current: php-pecl-zip-1.8.2-1-i686 Message-ID: <20061203210559.A3E9CFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203210216-60d9d-ccf36d9c13aa640c4dd8c654b34985f3892fddaa.gz; [php-pecl-zip-1.8.2-1-i686 CSÉCSY László **20061203210216 version bump ] { hunk ./source/devel-extra/php-pecl-zip/FrugalBuild 5 -pkgver=1.8.0 +pkgver=1.8.2 hunk ./source/devel-extra/php-pecl-zip/FrugalBuild 9 -sha1sums=('2f0089d3756a865522fe8b23d8c3971561f9965d') +sha1sums=('cef24114a3fa8cfe50ba6eaf7cc254d09f5aeb0e') } From vmiklos at frugalware.org Sun Dec 3 23:49:28 2006 From: vmiklos at frugalware.org (VMiklos) Date: Sun Dec 3 23:49:31 2006 Subject: [Frugalware-darcs] frugalware-current: splashy-0.2.1-3-i686 Message-ID: <20061203224928.BDB64FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203224652-e2957-61da802841044c01f5f87f4791256d87ad336ed4.gz; [splashy-0.2.1-3-i686 VMiklos **20061203224652 new theme drop the patch to fix up the old theme added support for upgradeing from -stable to .install ] { hunk ./source/base/splashy/FrugalBuild 6 -themever=0.5 +themever=0.6 hunk ./source/base/splashy/FrugalBuild 9 -pkgrel=2 +pkgrel=3 hunk ./source/base/splashy/FrugalBuild 22 - splashy-0.2.0-{frugalware,theme_update,tty1}.diff splashy-0.1.8.1-nof2.diff \ + splashy-0.2.0-{frugalware,tty1}.diff splashy-0.1.8.1-nof2.diff \ hunk ./source/base/splashy/FrugalBuild 45 - '13bb1c89031c4ca2d7eb2ed535ac51679752413f' \ hunk ./source/base/splashy/FrugalBuild 52 - '44140b1eb0071468e37c8f3ae782c197e40f054a') + '0efa9b3e92fe399a78f4d2acd36cfdb8020b71d9') hunk ./source/base/splashy/splashy-0.2.0-theme_update.diff 1 ---- splashy-0.2.0.orig/themes/frugalware/theme.xml 2006-10-18 15:05:16.000000000 +0200 -+++ splashy-0.2.0/themes/frugalware/theme.xml 2006-10-18 15:20:11.000000000 +0200 -@@ -38,6 +38,17 @@ - 0 - - -+ -+ -+ -+ 0 -+ 0 -+ 0 -+ 0 -+ -+ - - - rmfile ./source/base/splashy/splashy-0.2.0-theme_update.diff hunk ./source/base/splashy/splashy.install 8 + +post_upgrade() +{ + # this can be removed after Frugalware 0.6, it's here to support + # upgrades since there were no rc.zz-splash in 0.5 + post_install +} } From crazy at frugalware.org Mon Dec 4 00:02:43 2006 From: crazy at frugalware.org (crazy) Date: Mon Dec 4 00:02:46 2006 Subject: [Frugalware-darcs] frugalware-current: qtwine-0.3-1-i686 Message-ID: <20061203230243.E2B39FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203225925-f6986-327a16ec9f27a984eb0fe257f0514f92c38d9aaf.gz; [qtwine-0.3-1-i686 crazy **20061203225925 * New package * ( lol what a weird FB :s ) ] { adddir ./source/kde-extra/qtwine addfile ./source/kde-extra/qtwine/FrugalBuild hunk ./source/kde-extra/qtwine/FrugalBuild 1 +# Compiling Time: 0.22 SBU +# Maintainer: crazy + +pkgname=qtwine +pkgver=0.3 +pkgrel=1 +pkgdesc="QtWine is a tool for creating and managing wine configurations." +depends=('libxi' 'qt4' 'libstdc++' 'libice' 'libxrender') +_F_sourceforge_ext="-src.tar.bz2" +_F_sourceforge_broken_up2date=1 +_F_sourceforge_name="QtWine" +Finclude sourceforge +rodepends=('wine') +options=('scriptlet') +groups=('kde-extra') +archs=('i686' '!x86_64') +source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/QtWine-$pkgver$_F_sourceforge_ext) +sha1sums=('7a2181b685fd4c83c6cc5e20a659e7409f753a68') + +build() +{ + Fcd $pkgname-src + Ffilerel src/images/wine.png /usr/share/pixmaps/wine.png + source /etc/profile.d/qt4.sh.off + /usr/bin/qmake || Fdie + make || Fdie + Fexerel bin/QtWine.bin /usr/bin/$pkgname + Fdesktop "$pkgname" "/usr/share/pixmaps/wine.png" "Qt;Utility;" +} + +# optimization OK } From vmiklos at frugalware.org Mon Dec 4 00:55:32 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:38 2006 Subject: [Frugalware-darcs] frugalware-current: epplet-base-0.5-1-i686 Message-ID: <20061203235532.D9428FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203233900-e2957-4b269bb59b631ba8aac5db75eada5c4cc730efbc.gz; [epplet-base-0.5-1-i686 VMiklos **20061203233900 use Finclude sourceforge ] { hunk ./source/x11-extra/epplet-base/FrugalBuild 8 +_F_sourceforge_dirname="enlightenment" +Finclude sourceforge hunk ./source/x11-extra/epplet-base/FrugalBuild 12 -source=(http://heanet.dl.sourceforge.net/sourceforge/enlightenment/$pkgname-$pkgver.tar.gz) } From vmiklos at frugalware.org Mon Dec 4 00:55:33 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:41 2006 Subject: [Frugalware-darcs] frugalware-current: ede-1.1-1-i686 Message-ID: <20061203235533.502A5FA4701@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203233818-e2957-852c03075030b86b062fc467ebdd66769add3461.gz; [ede-1.1-1-i686 VMiklos **20061203233818 use Finclude sourceforge ] { hunk ./source/x11-extra/ede/FrugalBuild 9 +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/x11-extra/ede/FrugalBuild 19 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \ - http://ede.sourceforge.net/themes/EdeAirlock/EdeAirlock.tar.bz2 \ +source=($source http://ede.sourceforge.net/themes/EdeAirlock/EdeAirlock.tar.bz2 \ } From vmiklos at frugalware.org Mon Dec 4 00:55:33 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:41 2006 Subject: [Frugalware-darcs] frugalware-current: ethtool-3-1-i686 Message-ID: <20061203235534.12EEAFA4704@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203235139-e2957-c9037a642aa1bc8e03a10aa861a6e5b3c053ba3c.gz; [ethtool-3-1-i686 VMiklos **20061203235139 use Finclude sourceforge ] { hunk ./source/network/ethtool/FrugalBuild 9 +_F_sourceforge_dirname="gkernel" +Finclude sourceforge hunk ./source/network/ethtool/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz) hunk ./source/network/ethtool/FrugalBuild 28 -# vim: ft=sh - } From vmiklos at frugalware.org Mon Dec 4 00:55:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:42 2006 Subject: [Frugalware-darcs] frugalware-current: ctorrent-1.3.4-1-i686 Message-ID: <20061203235534.AF0D6FA4701@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203233507-e2957-fb5bc96cc8b122be5fd0f170f61cd81465b7a9b4.gz; [ctorrent-1.3.4-1-i686 VMiklos **20061203233507 use Finclude sourceforge ] { hunk ./source/network/ctorrent/FrugalBuild 9 +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/network/ctorrent/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) hunk ./source/network/ctorrent/FrugalBuild 18 - } From vmiklos at frugalware.org Mon Dec 4 00:55:34 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:43 2006 Subject: [Frugalware-darcs] frugalware-current: dvdstyler-1.4-6-i686 Message-ID: <20061203235535.52678FA4701@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203233617-e2957-75cc26c39c09e9344c96f154eaa86da8c93a09f3.gz; [dvdstyler-1.4-6-i686 VMiklos **20061203233617 use Finclude sourceforge ] { hunk ./source/xapps-extra/dvdstyler/FrugalBuild 8 +_F_sourceforge_dirname="dvdstyler" +_F_sourceforge_name="DVDStyler" +Finclude sourceforge hunk ./source/xapps-extra/dvdstyler/FrugalBuild 15 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/DVDStyler-$pkgver.tar.gz \ - dvdstyler-amd64-gcc4fix.patch) +source=($source dvdstyler-amd64-gcc4fix.patch) } From vmiklos at frugalware.org Mon Dec 4 00:55:36 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:50 2006 Subject: [Frugalware-darcs] frugalware-current: ecletex-0.0.4-1-i686 Message-ID: <20061203235536.520BFFA4707@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203233728-e2957-836c298f4647b9ecbae8124e4fabcb2f093f41a9.gz; [ecletex-0.0.4-1-i686 VMiklos **20061203233728 use Finclude sourceforge ] { hunk ./source/xapps-extra/ecletex/FrugalBuild 8 +_F_sourceforge_dirname="etex" +_F_sourceforge_ext=".zip" +Finclude sourceforge hunk ./source/xapps-extra/ecletex/FrugalBuild 15 -source=(http://heanet.dl.sourceforge.net/sourceforge/etex/ecletex.$pkgver.zip) +source=(${source/-$pkgver/.$pkgver}) } From vmiklos at frugalware.org Mon Dec 4 00:55:37 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:50 2006 Subject: [Frugalware-darcs] frugalware-current: eric-3.9.2-1-i686 Message-ID: <20061203235538.0F941FA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203234937-e2957-d209193f71070df0c0f49df2a6ee25a989db5bfc.gz; [eric-3.9.2-1-i686 VMiklos **20061203234937 use Finclude sourceforge ] { hunk ./source/xapps-extra/eric/FrugalBuild 8 +_F_sourceforge_dirname="$pkgname-ide" +Finclude sourceforge hunk ./source/xapps-extra/eric/FrugalBuild 13 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname-ide/$pkgname-$pkgver.tar.gz - http://heanet.dl.sourceforge.net/sourceforge/$pkgname-ide/eric-i18n-{de,fr,ru}-$pkgver.tar.gz \ - $pkgname.desktop) +source=($source ${source/eric-$pkgver/eric-i18n-de-$pkgver} \ + ${source/eric-$pkgver/eric-i18n-fr-$pkgver} \ + ${source/eric-$pkgver/eric-i18n-ru-$pkgver} $pkgname.desktop) } From vmiklos at frugalware.org Mon Dec 4 00:55:38 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:51 2006 Subject: [Frugalware-darcs] frugalware-current: ettercap-NG_0.7.3-1-i686 Message-ID: <20061203235539.DD56AFA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203235222-e2957-802f3bf0316b6edd76dbb1242dc3ea38e7bf69d0.gz; [ettercap-NG_0.7.3-1-i686 VMiklos **20061203235222 use Finclude sourceforge ] { hunk ./source/xapps-extra/ettercap/FrugalBuild 9 +Finclude sourceforge hunk ./source/xapps-extra/ettercap/FrugalBuild 15 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$origver.tar.gz) } From vmiklos at frugalware.org Mon Dec 4 00:55:40 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:52 2006 Subject: [Frugalware-darcs] frugalware-current: eterm-0.9.4-2-i686 Message-ID: <20061203235543.F22CBFA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203235050-e2957-04874d0a25b145cd5e3e7c444178e89f6d19ae83.gz; [eterm-0.9.4-2-i686 VMiklos **20061203235050 inherit source from sourceforge.sh ] { hunk ./source/xapps/eterm/FrugalBuild 14 +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_name="Eterm" hunk ./source/xapps/eterm/FrugalBuild 17 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/Eterm-$pkgver.tar.gz) } From vmiklos at frugalware.org Mon Dec 4 00:55:44 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 00:55:52 2006 Subject: [Frugalware-darcs] frugalware-current: fbpanel-4.3-1-i686 Message-ID: <20061203235544.CBDC3FA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061203235256-e2957-a09ea78bed479f9282ca3806fe2691a195b62657.gz; [fbpanel-4.3-1-i686 VMiklos **20061203235256 use Finclude sourceforge ] { hunk ./source/x11-extra/fbpanel/FrugalBuild 8 +_F_sourceforge_ext=".tgz" +Finclude sourceforge hunk ./source/x11-extra/fbpanel/FrugalBuild 13 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tgz) } From vmiklos at frugalware.org Mon Dec 4 11:51:39 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:51:50 2006 Subject: [Frugalware-darcs] frugalware-current: conky-1.4.4-1-i686 Message-ID: <20061204105139.E8E94FA4700@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204103532-e2957-2ab57cffc7c9ce00af12515ce2b27ea182b59d98.gz; [conky-1.4.4-1-i686 VMiklos **20061204103532 use Finclude sourceforge ] { hunk ./source/xapps-extra/conky/FrugalBuild 9 +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/xapps-extra/conky/FrugalBuild 17 -source=(http://heanet.dl.sourceforge.net/conky/$pkgname-$pkgver.tar.bz2) } From vmiklos at frugalware.org Mon Dec 4 11:51:38 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:51:52 2006 Subject: [Frugalware-darcs] frugalware-current: bwidget-1.8.0-1-i686 Message-ID: <20061204105139.1882EFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204103235-e2957-cf5536adacefbaea84834be306e24fecd5fee613.gz; [bwidget-1.8.0-1-i686 VMiklos **20061204103235 use Finclude sourceforge ] { hunk ./source/devel-extra/bwidget/FrugalBuild 8 +_F_sourceforge_dirname="tcllib" +_F_sourceforge_name="BWidget" +Finclude sourceforge hunk ./source/devel-extra/bwidget/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/tcllib/BWidget-$pkgver.tar.gz) } From vmiklos at frugalware.org Mon Dec 4 11:51:41 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:51:53 2006 Subject: [Frugalware-darcs] frugalware-current: coccinella-0.95.15-1-i686 Message-ID: <20061204105141.790FBFA4704@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204103448-e2957-8670fe89f2f45a0c71537da9e97a6fd14453d9e8.gz; [coccinella-0.95.15-1-i686 VMiklos **20061204103448 inherit source from sourceforge.sh ] { hunk ./source/xapps-extra/coccinella/FrugalBuild 12 +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_name="Coccinella" +_F_sourceforge_ext="Src.tar.gz" hunk ./source/xapps-extra/coccinella/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/coccinella/Coccinella-${pkgver}Src.tar.gz) } From vmiklos at frugalware.org Mon Dec 4 11:51:41 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:51:54 2006 Subject: [Frugalware-darcs] frugalware-current: courier-imap-4.1.1-1-i686 Message-ID: <20061204105142.7BD20FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204104505-e2957-5f409ea9c4f4fc484a1706adc7c504c6c9b549df.gz; [courier-imap-4.1.1-1-i686 VMiklos **20061204104505 use Finclude sourceforge ] { hunk ./source/network-extra/courier-imap/FrugalBuild 8 +_F_sourceforge_dirname="courier" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/network-extra/courier-imap/FrugalBuild 18 -source=(http://heanet.dl.sourceforge.net/courier/$pkgname-$pkgver.tar.bz2 \ - rc.courier-imapd rc.courier-imapd-ssl rc.courier-pop3d \ +source=($source rc.courier-imapd rc.courier-imapd-ssl rc.courier-pop3d \ } From vmiklos at frugalware.org Mon Dec 4 11:51:40 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:51:55 2006 Subject: [Frugalware-darcs] frugalware-current: corefonts-1.3r4-4-i686 Message-ID: <20061204105140.80660FA4703@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204104032-e2957-41d89aab8ed1c43eccb7133dfb53a4ffcbce0e44.gz; [corefonts-1.3r4-4-i686 VMiklos **20061204104032 use Finclude sourceforge ] { hunk ./source/xlib/corefonts/FrugalBuild 8 +Finclude sourceforge hunk ./source/xlib/corefonts/FrugalBuild 14 -source=(http://dl.sourceforge.net/sourceforge/corefonts/{andale32,arial32,arialb32,comic32,courie32,georgi32,impact32,times32,trebuc32,verdan32,webdin32}.exe) +source=(`eval echo ${source/$pkgname-$pkgver.tar.gz/{andale32.exe,arial32.exe,arialb32.exe,comic32.exe,courie32.exe,georgi32.exe,impact32.exe,times32.exe,trebuc32.exe,verdan32.exe,webdin32.exe}}`) } From vmiklos at frugalware.org Mon Dec 4 11:51:43 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:51:56 2006 Subject: [Frugalware-darcs] frugalware-current: boost-1.33.1-2-i686 Message-ID: <20061204105143.51171FA4703@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204103022-e2957-e365af3f499cd3b2c6c13441fc47be5d5e2f1fe1.gz; [boost-1.33.1-2-i686 VMiklos **20061204103022 use Finclude sourceforge ] { hunk ./source/devel-extra/boost/FrugalBuild 8 +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/devel-extra/boost/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/$pkgname/${pkgname}_`echo $pkgver | sed -e 's/\./_/' |sed -e 's/\./_/'`.tar.bz2) +source=(${source/-$pkgver/_${pkgver//./_}}) } From vmiklos at frugalware.org Mon Dec 4 11:51:43 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:51:56 2006 Subject: [Frugalware-darcs] frugalware-current: blackbox-0.70.1-2-i686 Message-ID: <20061204105143.EC255FA4703@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204102812-e2957-4f224a3884cb3e11ec28c93203cc2aadff35d927.gz; [blackbox-0.70.1-2-i686 VMiklos **20061204102812 use Finclude sourceforge ] { hunk ./source/xlib/blackbox/FrugalBuild 6 -realname=blackboxwm hunk ./source/xlib/blackbox/FrugalBuild 10 +_F_sourceforge_dirname="blackboxwm" +Finclude sourceforge hunk ./source/xlib/blackbox/FrugalBuild 18 -source=(http://heanet.dl.sourceforge.net/sourceforge/$realname/$pkgname-$pkgver.tar.gz xinitrc.$pkgname $pkgname.desktop menu) +source=($source xinitrc.$pkgname $pkgname.desktop menu) } From vmiklos at frugalware.org Mon Dec 4 11:51:44 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:51:58 2006 Subject: [Frugalware-darcs] frugalware-current: boost-jam-3.1.13-2-i686 Message-ID: <20061204105145.0E43DFA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204103124-e2957-11029c7e2004b4d9aaf0d1f772415d0780a16f51.gz; [boost-jam-3.1.13-2-i686 VMiklos **20061204103124 use Finlcude sourceforge ] { hunk ./source/devel-extra/boost-jam/FrugalBuild 8 +_F_sourceforge_dirname="boost" +_F_sourceforge_ext=".tgz" +Finclude sourceforge hunk ./source/devel-extra/boost-jam/FrugalBuild 17 -source=(http://heanet.dl.sourceforge.net/boost/$pkgname-$pkgver.tgz boost-jam-misc.patch) +source=($source boost-jam-misc.patch) } From vmiklos at frugalware.org Mon Dec 4 11:51:47 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:51:59 2006 Subject: [Frugalware-darcs] frugalware-current: courier-authlib-0.58-1-i686 Message-ID: <20061204105147.CC948FA4703@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204104240-e2957-3a8f2743a0db08aa026e0f9bba0ad61538062247.gz; [courier-authlib-0.58-1-i686 VMiklos **20061204104240 use Finclude sourceforge ] { hunk ./source/network-extra/courier-authlib/FrugalBuild 8 +_F_sourceforge_dirname="courier" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/network-extra/courier-authlib/FrugalBuild 17 -source=(http://heanet.dl.sourceforge.net/sourceforge/courier/$pkgname-$pkgver.tar.bz2 \ - rc.courier-authlib rc.courier-authlib-de.po authdaemonrc.frugal \ +source=($source rc.courier-authlib rc.courier-authlib-de.po authdaemonrc.frugal \ } From vmiklos at frugalware.org Mon Dec 4 11:51:49 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 11:52:03 2006 Subject: [Frugalware-darcs] frugalware-current: coriander-2.0.0_rc1-1-i686 Message-ID: <20061204105149.A8859FA4716@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204104143-e2957-25f75d47628a49f8845eee8396731e8dcd9fbed2.gz; [coriander-2.0.0_rc1-1-i686 VMiklos **20061204104143 use Finclude sourceforge ] { hunk ./source/gnome-extra/coriander/FrugalBuild 8 +Finclude sourceforge hunk ./source/gnome-extra/coriander/FrugalBuild 14 -source=(http://heanet.dl.sourceforge.net/sourceforge/coriander/$pkgname-`echo $pkgver | sed 's/_/-/'`.tar.gz \ - ffmpeg-pkgconfig-detect.patch) +source=($source ffmpeg-pkgconfig-detect.patch) } From xbit at frugalware.org Mon Dec 4 12:49:01 2006 From: xbit at frugalware.org (xbit@frugalware.org) Date: Mon Dec 4 12:49:06 2006 Subject: [Frugalware-darcs] pacman-tools: rf - bugfix in closing an if statement(clanup()) Message-ID: <20061204114902.A045EFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20061204114744-f81c5-84e7e7bdeddca4c8a9f9f98d19d56ba7561f1b9f.gz; [rf - bugfix in closing an if statement(clanup()) xbit@frugalware.org**20061204114744] { hunk ./rf 675 -# print "Nothing to do, that's fine!\n\n" unless @sourcefiles || @pkgfiles; -# if (@sourcefiles){ + # print "Nothing to do, that's fine!\n\n" unless @sourcefiles || @pkgfiles; + # if (@sourcefiles){ hunk ./rf 682 -# } - splice(@inrepo,0,1); - @inrepo = grep $_ ne "Changelog\n",@inrepo; - foreach $ir (@inrepo){ - unless(scalar grep(/\Q$ir\E/, @indarcs)){ - $ec = apply "repoman -t $version del $repo/source/$group/$pkgname/$ir";}}} + } + splice(@inrepo,0,1); + @inrepo = grep $_ ne "Changelog\n",@inrepo; + foreach $ir (@inrepo){ + unless(scalar grep(/\Q$ir\E/, @indarcs)){ + $ec = apply "repoman -t $version del $repo/source/$group/$pkgname/$ir"; + } + } + } From xbit at frugalware.org Mon Dec 4 13:56:32 2006 From: xbit at frugalware.org (xbit@frugalware.org) Date: Mon Dec 4 13:56:35 2006 Subject: [Frugalware-darcs] pacman-tools: rf - new -c option Message-ID: <20061204125632.EE222FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20061204125511-f81c5-cd2605933499554b0f9f8de09fd9073db7bfe826.gz; [rf - new -c option xbit@frugalware.org**20061204125511] { hunk ./rf 118 -#=item B<-c> -# -# Try to delete source and .fpm files -# +=item B<-c> + + Try to delete only .fpm files + hunk ./rf 673 - print "Cleanup on server\n"; - my $repo_=$repo . '/' if $repo; - # print "Nothing to do, that's fine!\n\n" unless @sourcefiles || @pkgfiles; - # if (@sourcefiles){ - my (@indarcs) = qx"repoman -t $version ls _darcs/current/$repo_/source/$group/$pkgname/ 2>&1"; - my (@inrepo) = qx"repoman -t $version ls $repo_/source/$group/$pkgname/ 2>&1"; - if ($inrepo[1] =~ 'No such file or') { - print "Probably it is a new package, passing by...\n"; - return; - } - splice(@inrepo,0,1); - @inrepo = grep $_ ne "Changelog\n",@inrepo; - foreach $ir (@inrepo){ - unless(scalar grep(/\Q$ir\E/, @indarcs)){ - $ec = apply "repoman -t $version del $repo/source/$group/$pkgname/$ir"; + unless ($opts{'c'}){ + print "Cleanup on server\n"; + my $repo_=$repo . '/' if $repo; + # print "Nothing to do, that's fine!\n\n" unless @sourcefiles || @pkgfiles; + # if (@sourcefiles){ + my (@indarcs) = qx"repoman -t $version ls _darcs/current/$repo_/source/$group/$pkgname/ 2>&1"; + my (@inrepo) = qx"repoman -t $version ls $repo_/source/$group/$pkgname/ 2>&1"; + if ($inrepo[1] =~ 'No such file or') { + print "Probably it is a new package, passing by...\n"; + return; + } + splice(@inrepo,0,1); + @inrepo = grep $_ ne "Changelog\n",@inrepo; + foreach $ir (@inrepo){ + unless(scalar grep(/\Q$ir\E/, @indarcs)){ + $ec = apply "repoman -t $version del $repo/source/$group/$pkgname/$ir"; + } } From crazy at frugalware.org Mon Dec 4 15:54:37 2006 From: crazy at frugalware.org (crazy) Date: Mon Dec 4 15:54:40 2006 Subject: [Frugalware-darcs] frugalware-current: kdegraphics-3.5.5-2-i686 Message-ID: <20061204145437.2E173FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204144746-f6986-b76994b93c0c89895a137a1a4458e1de26e2cccd.gz; [kdegraphics-3.5.5-2-i686 crazy **20061204144746 * [SEC] relbump * closes #1507 in -current ] { addfile ./source/kde/kdegraphics/post-3.5.5-kdegraphics.diff hunk ./source/kde/kdegraphics/FrugalBuild 6 -pkgrel=1 +pkgrel=2 hunk ./source/kde/kdegraphics/FrugalBuild 15 -sha1sums=('e063f9351e2781cc6a5d23834611fc7dc7dc4fbd') +source=($source post-3.5.5-kdegraphics.diff) +sha1sums=('e063f9351e2781cc6a5d23834611fc7dc7dc4fbd' \ + 'f48513bd60956c67aa877f52dd1daa25b41d43bb') + hunk ./source/kde/kdegraphics/FrugalBuild 28 - Fbuild --disable-warnings \ - --disable-kpdf-drm --with-openexr \ - --with-gphoto2-libraries=/usr/lib \ - --with-gphoto2-includes=/usr/include/gphoto2 \ - --with-imlib-config=/usr/bin \ - --with-jpeg=/usr/lib \ - --with-tiff=/usr/lib \ - --with-poppler --without-debug \ - --disable-debug --without-debug --with-gnu-ld \ - --enable-gcc-hidden-visibility --disable-dependency-tracking + Fbuild \ + --disable-warnings \ + --disable-kpdf-drm \ + --with-openexr \ + --with-gphoto2-libraries=/usr/lib \ + --with-gphoto2-includes=/usr/include/gphoto2 \ + --with-imlib-config=/usr/bin \ + --with-jpeg=/usr/lib \ + --with-tiff=/usr/lib \ + --with-poppler \ + --without-debug \ + --disable-debug \ + --with-gnu-ld \ + --enable-gcc-hidden-visibility \ + --disable-dependency-tracking hunk ./source/kde/kdegraphics/post-3.5.5-kdegraphics.diff 1 +--- kfile-plugins/jpeg/exif.h ++++ kfile-plugins/jpeg/exif.h +@@ -72,7 +72,8 @@ + int Get32s(void * Long); + unsigned Get32u(void * Long); + double ConvertAnyFormat(void * ValuePtr, int Format); +- void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength); ++ void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, ++ unsigned NestingLevel); + void process_COM (const uchar * Data, int length); + void process_SOFn (const uchar * Data, int marker); + int Get16m(const void * Short); +--- kfile-plugins/jpeg/exif.cpp ++++ kfile-plugins/jpeg/exif.cpp +@@ -446,7 +446,7 @@ + //-------------------------------------------------------------------------- + // Process one of the nested EXIF directories. + //-------------------------------------------------------------------------- +-void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength) ++void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, unsigned NestingLevel) + { + int de; + int a; +@@ -454,6 +454,9 @@ + unsigned ThumbnailOffset = 0; + unsigned ThumbnailSize = 0; + ++ if ( NestingLevel > 4) ++ throw FatalError("Maximum directory nesting exceeded (corrupt exif header)"); ++ + NumDirEntries = Get16u(DirStart); + #define DIR_ENTRY_ADDR(Start, Entry) (Start+2+12*(Entry)) + +@@ -476,7 +479,7 @@ + for (de=0;de 0x10000) { ++ throw FatalError("Illegal number of components for tag"); ++ continue; ++ } ++ + ByteCount = Components * BytesPerFormat[Format]; + + if (ByteCount > 4){ +@@ -517,11 +525,11 @@ + switch(Tag){ + + case TAG_MAKE: +- ExifData::CameraMake = QString((char*)ValuePtr); ++ ExifData::CameraMake = QString::fromLatin1((const char*)ValuePtr, 31); + break; + + case TAG_MODEL: +- ExifData::CameraModel = QString((char*)ValuePtr); ++ ExifData::CameraModel = QString::fromLatin1((const char*)ValuePtr, 39); + break; + + case TAG_ORIENTATION: +@@ -529,7 +537,7 @@ + break; + + case TAG_DATETIME_ORIGINAL: +- DateTime = QString((char*)ValuePtr); ++ DateTime = QString::fromLatin1((const char*)ValuePtr, 19); + break; + + case TAG_USERCOMMENT: +@@ -550,14 +558,12 @@ + int c; + c = (ValuePtr)[a]; + if (c != '\0' && c != ' '){ +- //strncpy(ImageInfo.Comments, (const char*)(a+ValuePtr), 199); +- UserComment.sprintf("%s", (const char*)(a+ValuePtr)); ++ UserComment = QString::fromLatin1((const char*)(a+ValuePtr), 199); + break; + } + } + }else{ +- //strncpy(ImageInfo.Comments, (const char*)ValuePtr, 199); +- UserComment.sprintf("%s", (const char*)ValuePtr); ++ UserComment = QString::fromLatin1((const char*)ValuePtr, 199); + } + break; + +@@ -676,10 +682,10 @@ + if (Tag == TAG_EXIF_OFFSET || Tag == TAG_INTEROP_OFFSET){ + unsigned char * SubdirStart; + SubdirStart = OffsetBase + Get32u(ValuePtr); +- if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength){ ++ if (SubdirStart <= OffsetBase || SubdirStart >= OffsetBase+ExifLength){ + throw FatalError("Illegal subdirectory link"); + } +- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); ++ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); + continue; + } + } +@@ -709,7 +715,7 @@ + } + }else{ + if (SubdirStart <= OffsetBase+ExifLength){ +- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); ++ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); + } + } + } +@@ -719,7 +725,7 @@ + } + + if (ThumbnailSize && ThumbnailOffset){ +- if (ThumbnailSize + ThumbnailOffset <= ExifLength){ ++ if (ThumbnailSize + ThumbnailOffset < ExifLength){ + // The thumbnail pointer appears to be valid. Store it. + Thumbnail.loadFromData(OffsetBase + ThumbnailOffset, ThumbnailSize, "JPEG"); + } +@@ -810,7 +816,7 @@ + LastExifRefd = CharBuf; + + // First directory starts 16 bytes in. Offsets start at 8 bytes in. +- ProcessExifDir(CharBuf+16, CharBuf+8, length-6); ++ ProcessExifDir(CharBuf+16, CharBuf+8, length-6, 0); + + // This is how far the interesting (non thumbnail) part of the exif went. + ExifSettingsLength = LastExifRefd - CharBuf; } From voroskoi at frugalware.org Mon Dec 4 16:14:33 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Dec 4 16:14:36 2006 Subject: [Frugalware-darcs] homepage-ng: FSA61-proftpd Message-ID: <20061204151434.14E63FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20061204151351-dd049-31590dc17b24a4cad28d0ed2b4cb7f280ff2efa3.gz; [FSA61-proftpd voroskoi **20061204151351] { hunk ./frugalware/xml/security.xml 29 + + 61 + 2006-12-04 + voroskoi + proftpd + 1.3.0-2siwenna1 + 1.3.0-3siwenna1 + http://bugs.frugalware.org/task/1461 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-5815 + Evgeny Legerov has reported a vulnerability in ProFTPD, which potentially can be exploited by malicious user's to compromise a vulnerable system. + The vulnerability is caused due to an off-by-one error within the "sreplace()" function in src/support.c. This can be exploited to cause a buffer overflow by e.g. uploading a malicious ".message" file or sending specially crafted commands to the server. + Successful exploitation may allow execution of arbitrary code. + } From voroskoi at frugalware.org Mon Dec 4 17:15:37 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Dec 4 17:15:51 2006 Subject: [Frugalware-darcs] homepage-ng: FSA62-kile Message-ID: <20061204161537.42129FA4704@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20061204161427-dd049-1553d99d500a71a04f873a297ad8fc7de690589f.gz; [FSA62-kile voroskoi **20061204161427] { hunk ./frugalware/xml/security.xml 29 + + 62 + 2006-12-04 + voroskoi + kile + 1.9.2-1 + 1.9.3-1siwenna1 + http://bugs.frugalware.org/task/1493 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-6085 + A security issue has been reported in Kile, which can be exploited by malicious, local users to gain knowledge of certain information. + The security issue is caused due to backup files being created with default permissions even when the original file had more restrictive permissions set. This can potentially disclose the contents of files edited by other users. + } From voroskoi at frugalware.org Mon Dec 4 17:17:53 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Dec 4 17:17:55 2006 Subject: [Frugalware-darcs] frugalware-0.5: tar-1.15.1-5siwenna1-i686 Message-ID: <20061204161754.2B9D6FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20061204160657-dd049-167479b367ef1f10702445578b340cdf7bc386e1.gz; [tar-1.15.1-5siwenna1-i686 voroskoi **20061204160657 secfix relbump, closes #1496 ] { addfile ./source/base/tar/18355.diff hunk ./source/base/tar/18355.diff 1 +--- tar-1.16.orig/src/common.h ++++ tar-1.16/src/common.h +@@ -105,6 +105,9 @@ + + GLOBAL bool absolute_names_option; + ++/* Allow GNUTYPE_NAMES type? */ ++GLOBAL bool allow_name_mangling_option; ++ + /* Display file times in UTC */ + GLOBAL bool utc_option; + +--- tar-1.15.1.orig/src/extract.c ++++ tar-1.15.1/src/extract.c +@@ -1101,7 +1107,13 @@ + break; + + case GNUTYPE_NAMES: +- extract_mangle (); ++ if (allow_name_mangling_option) { ++ extract_mangle (); ++ } ++ else { ++ ERROR ((0, 0, _("GNUTYPE_NAMES mangling ignored"))); ++ skip_member (); ++ } + break; + + case GNUTYPE_MULTIVOL: +--- tar-1.15.1.orig/src/tar.c ++++ tar-1.15.1/src/tar.c +@@ -181,6 +181,7 @@ + enum + { + ANCHORED_OPTION = CHAR_MAX + 1, ++ ALLOW_NAME_MANGLING_OPTION, + ATIME_PRESERVE_OPTION, + BACKUP_OPTION, + CHECKPOINT_OPTION, +@@ -528,6 +529,8 @@ + + {NULL, 'o', 0, 0, + N_("when creating, same as --old-archive. When extracting, same as --no-same-owner"), 91 }, ++ {"allow-name-mangling", ALLOW_NAME_MANGLING_OPTION, 0, 0, ++ N_("when creating, allow GNUTYPE_NAMES mangling -- considered dangerous"), 91 }, + + {NULL, 0, NULL, 0, + N_("Other options:"), 100 }, +@@ -913,6 +916,10 @@ + case 'Z': + set_use_compress_program_option ("compress"); + break; ++ ++ case ALLOW_NAME_MANGLING_OPTION: ++ allow_name_mangling_option = true; ++ break; + + case ANCHORED_OPTION: + args->exclude_options |= EXCLUDE_ANCHORED; hunk ./source/base/tar/FrugalBuild 1 -# Last Modified: Wed, 10 May 2006 19:43:42 +0200 hunk ./source/base/tar/FrugalBuild 6 -pkgrel=4 +pkgrel=5siwenna1 hunk ./source/base/tar/FrugalBuild 14 - $pkgname-$pkgver-lzma.diff tar-1.15.1-cve_2006_0300.diff) -sha1sums=('21574ae5d39b698f7f577e2cecc91a5ec89b659c' \ - '4b1ad46664b97bb83de1dc90877a7e5986872806' \ - '675657cae29fd5dae52ad240d03840d32e72ab2d' \ - '2fd2ba3048d2eed952ae8ded5a57b4dcf6370e58') + $pkgname-$pkgver-lzma.diff tar-1.15.1-cve_2006_0300.diff 18355.diff) hunk ./source/base/tar/FrugalBuild 21 +sha1sums=('21574ae5d39b698f7f577e2cecc91a5ec89b659c' \ + '4b1ad46664b97bb83de1dc90877a7e5986872806' \ + '675657cae29fd5dae52ad240d03840d32e72ab2d' \ + '2fd2ba3048d2eed952ae8ded5a57b4dcf6370e58' \ + '50f557c622192618db5c8f5269c0061e70d1dfa0') hunk ./source/base/tar/FrugalBuild 27 -# optimization ok +# optimization OK } From alex at alex-smith.me.uk Mon Dec 4 17:44:18 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Mon Dec 4 17:44:21 2006 Subject: [Frugalware-darcs] frugalware-current: libgtop-2.14.5-1-i686 Message-ID: <20061204164418.98BF3FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204164225-46e39-7034f53497555f7f3b81bebfac7272858b87f657.gz; [libgtop-2.14.5-1-i686 AlexExtreme **20061204164225 * Version bump ] { hunk ./source/gnome/libgtop/FrugalBuild 5 -pkgver=2.14.4 +pkgver=2.14.5 hunk ./source/gnome/libgtop/FrugalBuild 10 -makedepends=('libxt' 'perl-xml') +makedepends=('libxt' 'perl-xml' 'gtk-doc') hunk ./source/gnome/libgtop/FrugalBuild 14 -sha1sums=('d73991648877da83af0da48ac6b2d5491cede6fd') +sha1sums=('6a6df5453660018dd9275c396074843a9cd017fa') } From voroskoi at frugalware.org Mon Dec 4 17:49:19 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Dec 4 17:49:23 2006 Subject: [Frugalware-darcs] frugalware-0.5: kdegraphics-3.5.4-4siwenna1-x86_64 Message-ID: <20061204164919.EA474FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20061204164739-dd049-513f19b303f6741e659346fe9866a593098143eb.gz; [kdegraphics-3.5.4-4siwenna1-x86_64 voroskoi **20061204164739 secfix relbump, closes #1507 ] { addfile ./source/kde/kdegraphics/post-3.5.5-kdegraphics.diff hunk ./source/kde/kdegraphics/FrugalBuild 1 -# Last Modified: Mon, 04 Sep 2006 03:42:25 +0200 hunk ./source/kde/kdegraphics/FrugalBuild 6 -pkgrel=3 +pkgrel=4siwenna1 hunk ./source/kde/kdegraphics/FrugalBuild 15 -sha1sums=('62613a9bdfc2d4975e24f9cc689cac00dcb72637') +source=(${source[@]} post-3.5.5-kdegraphics.diff) +sha1sums=('62613a9bdfc2d4975e24f9cc689cac00dcb72637' \ + '321fcad3bfe099b826ff6f062448a9a20bc78719') hunk ./source/kde/kdegraphics/post-3.5.5-kdegraphics.diff 1 +--- foo/kfile-plugins/jpeg/exif.h ++++ kfile-plugins/jpeg/exif.h +@@ -72,7 +72,8 @@ + int Get32s(void * Long); + unsigned Get32u(void * Long); + double ConvertAnyFormat(void * ValuePtr, int Format); +- void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength); ++ void ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, ++ unsigned NestingLevel); + void process_COM (const uchar * Data, int length); + void process_SOFn (const uchar * Data, int marker); + int Get16m(const void * Short); +--- foo/kfile-plugins/jpeg/exif.cpp ++++ kfile-plugins/jpeg/exif.cpp +@@ -446,7 +446,7 @@ + //-------------------------------------------------------------------------- + // Process one of the nested EXIF directories. + //-------------------------------------------------------------------------- +-void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength) ++void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBase, unsigned ExifLength, unsigned NestingLevel) + { + int de; + int a; +@@ -454,6 +454,9 @@ + unsigned ThumbnailOffset = 0; + unsigned ThumbnailSize = 0; + ++ if ( NestingLevel > 4) ++ throw FatalError("Maximum directory nesting exceeded (corrupt exif header)"); ++ + NumDirEntries = Get16u(DirStart); + #define DIR_ENTRY_ADDR(Start, Entry) (Start+2+12*(Entry)) + +@@ -476,7 +479,7 @@ + for (de=0;de 0x10000) { ++ throw FatalError("Illegal number of components for tag"); ++ continue; ++ } ++ + ByteCount = Components * BytesPerFormat[Format]; + + if (ByteCount > 4){ +@@ -517,11 +525,11 @@ + switch(Tag){ + + case TAG_MAKE: +- ExifData::CameraMake = QString((char*)ValuePtr); ++ ExifData::CameraMake = QString::fromLatin1((const char*)ValuePtr, 31); + break; + + case TAG_MODEL: +- ExifData::CameraModel = QString((char*)ValuePtr); ++ ExifData::CameraModel = QString::fromLatin1((const char*)ValuePtr, 39); + break; + + case TAG_ORIENTATION: +@@ -529,7 +537,7 @@ + break; + + case TAG_DATETIME_ORIGINAL: +- DateTime = QString((char*)ValuePtr); ++ DateTime = QString::fromLatin1((const char*)ValuePtr, 19); + break; + + case TAG_USERCOMMENT: +@@ -550,14 +558,12 @@ + int c; + c = (ValuePtr)[a]; + if (c != '\0' && c != ' '){ +- //strncpy(ImageInfo.Comments, (const char*)(a+ValuePtr), 199); +- UserComment.sprintf("%s", (const char*)(a+ValuePtr)); ++ UserComment = QString::fromLatin1((const char*)(a+ValuePtr), 199); + break; + } + } + }else{ +- //strncpy(ImageInfo.Comments, (const char*)ValuePtr, 199); +- UserComment.sprintf("%s", (const char*)ValuePtr); ++ UserComment = QString::fromLatin1((const char*)ValuePtr, 199); + } + break; + +@@ -676,10 +682,10 @@ + if (Tag == TAG_EXIF_OFFSET || Tag == TAG_INTEROP_OFFSET){ + unsigned char * SubdirStart; + SubdirStart = OffsetBase + Get32u(ValuePtr); +- if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength){ ++ if (SubdirStart <= OffsetBase || SubdirStart >= OffsetBase+ExifLength){ + throw FatalError("Illegal subdirectory link"); + } +- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); ++ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); + continue; + } + } +@@ -709,7 +715,7 @@ + } + }else{ + if (SubdirStart <= OffsetBase+ExifLength){ +- ProcessExifDir(SubdirStart, OffsetBase, ExifLength); ++ ProcessExifDir(SubdirStart, OffsetBase, ExifLength, NestingLevel+1); + } + } + } +@@ -719,7 +725,7 @@ + } + + if (ThumbnailSize && ThumbnailOffset){ +- if (ThumbnailSize + ThumbnailOffset <= ExifLength){ ++ if (ThumbnailSize + ThumbnailOffset < ExifLength){ + // The thumbnail pointer appears to be valid. Store it. + Thumbnail.loadFromData(OffsetBase + ThumbnailOffset, ThumbnailSize, "JPEG"); + } +@@ -810,7 +816,7 @@ + LastExifRefd = CharBuf; + + // First directory starts 16 bytes in. Offsets start at 8 bytes in. +- ProcessExifDir(CharBuf+16, CharBuf+8, length-6); ++ ProcessExifDir(CharBuf+16, CharBuf+8, length-6, 0); + + // This is how far the interesting (non thumbnail) part of the exif went. + ExifSettingsLength = LastExifRefd - CharBuf; } From alex at alex-smith.me.uk Mon Dec 4 17:57:14 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Mon Dec 4 17:57:18 2006 Subject: [Frugalware-darcs] frugalware-current: bug-buddy-2.17.2-1-i686 Message-ID: <20061204165715.27FC2FA4705@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204165627-46e39-0506922f4b7219f8251f91ae325a7d0d3c6ed2b5.gz; [bug-buddy-2.17.2-1-i686 AlexExtreme **20061204165627 * Version bump ] { hunk ./source/gnome/bug-buddy/FrugalBuild 5 -pkgver=2.16.0 -pkgrel=4 +pkgver=2.17.2 +pkgrel=1 hunk ./source/gnome/bug-buddy/FrugalBuild 19 -sha1sums=('e1319362b59a39e5c68b5fb079a2b0497506e5cd' \ +sha1sums=('343274ec6d0fa06424f3a28c27ed954f91f9bc4d' \ } From alex at alex-smith.me.uk Mon Dec 4 19:03:04 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Mon Dec 4 19:03:11 2006 Subject: [Frugalware-darcs] frugalware-current: gedit-2.17.1-1-i686 Message-ID: <20061204180304.B92ABFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204180033-46e39-2c713862f78eec1afa90185ba45e381ad7b37112.gz; [gedit-2.17.1-1-i686 AlexExtreme **20061204180033 * Version bump ] { hunk ./source/gnome/gedit/FrugalBuild 5 -pkgver=2.16.2 +pkgver=2.17.1 hunk ./source/gnome/gedit/FrugalBuild 9 -depends=('aspell' 'eel>=2.16.0' 'scrollkeeper' 'desktop-file-utils' 'python' 'gtksourceview' 'dbus-glib>=0.71-2') +depends=('eel>=2.16.0' 'scrollkeeper' 'desktop-file-utils' 'python' 'gtksourceview' 'dbus-glib>=0.71-2' 'enchant' 'iso-codes') hunk ./source/gnome/gedit/FrugalBuild 18 -sha1sums=('02e653ed0f8eaf5e147e24d8e4e5291eb94814e3') +sha1sums=('4a2d67dd94e553b24aa5a581ad729d3cf703e08f') } From alex at alex-smith.me.uk Mon Dec 4 19:23:01 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Mon Dec 4 19:23:04 2006 Subject: [Frugalware-darcs] frugalware-current: python-ldap-2.2.1-1-i686 Message-ID: <20061204182302.145F3FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204182208-46e39-95190a5f10c7c45ba9fe4477ee22dffbbb347019.gz; [python-ldap-2.2.1-1-i686 AlexExtreme **20061204182208 * Version bump ] { hunk ./source/devel-extra/python-ldap/FrugalBuild 5 -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.1 +pkgrel=1 hunk ./source/devel-extra/python-ldap/FrugalBuild 14 -sha1sums=('bc25275af4690b7438728787bd429e249e428260' \ - 'ba24ef06ceba30b76bbde407f6ca54431ee5d047') +sha1sums=('c2dee55a7002777fe417fcc201dceb090a0207e0' \ + '99f85ccac0fbe1e021679fd1ec97709ea845fe24') hunk ./source/devel-extra/python-ldap/setup.cfg 37 -# distribution_name = +distribution_name = Frugalware } From voroskoi at frugalware.org Mon Dec 4 20:30:27 2006 From: voroskoi at frugalware.org (voroskoi) Date: Mon Dec 4 20:30:39 2006 Subject: [Frugalware-darcs] frugalware-0.5: libgsf-1.14.1-4siwenna1-i686 Message-ID: <20061204193028.2771BFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20061204191721-dd049-727004cd6db2209bd67372a3626e1e31c9ca5fcb.gz; [libgsf-1.14.1-4siwenna1-i686 voroskoi **20061204191721 secfix relbump, closes #1503 ] { addfile ./source/gnome/libgsf/CVE-2006-4514 addfile ./source/gnome/libgsf/CVE-2006-4514.diff rmfile ./source/gnome/libgsf/CVE-2006-4514 hunk ./source/gnome/libgsf/CVE-2006-4514.diff 1 +--- libgsf/gsf/gsf-infile-msole.c 2006/09/06 20:39:46 1.73 ++++ libgsf/gsf/gsf-infile-msole.c 2006/09/24 01:55:24 1.74 +@@ -198,7 +198,7 @@ + * Returns: a pointer to the element after the last position filled. + **/ + static guint32 * +-ole_info_read_metabat (GsfInfileMSOle *ole, guint32 *bats, guint32 max, ++ole_info_read_metabat (GsfInfileMSOle *ole, guint32 *bats, guint32 max_bat, + guint32 const *metabat, guint32 const *metabat_end) + { + guint8 const *bat, *end; +@@ -211,7 +211,7 @@ + end = bat + ole->info->bb.size; + for ( ; bat < end ; bat += BAT_INDEX_SIZE, bats++) { + *bats = GSF_LE_GET_GUINT32 (bat); +- g_return_val_if_fail (*bats < max || ++ g_return_val_if_fail (*bats < max_bat || + *bats >= BAT_MAGIC_METABAT, NULL); + } + } else { +@@ -595,6 +595,13 @@ + last = num_bat; + } else if (num_metabat > 0) { + metabat_block = metabat[last]; ++ if (num_bat < last) { ++ /* ::num_bat and ::num_metabat are ++ * inconsistent. There are too many metabats ++ * for the bat count in the header. */ ++ ptr = NULL; ++ break; ++ } + num_bat -= last; + } + hunk ./source/gnome/libgsf/FrugalBuild 1 -# Last modified: Wed, 06 Sep 2006 22:01:19 +0200 hunk ./source/gnome/libgsf/FrugalBuild 6 -pkgrel=3 +pkgrel=4siwenna1 hunk ./source/gnome/libgsf/FrugalBuild 15 -sha1sums=('6e719212a1756b449f93548d6357c6b4cf07c327') hunk ./source/gnome/libgsf/FrugalBuild 16 +source=(${source[@]} CVE-2006-4514.diff) +sha1sums=('6e719212a1756b449f93548d6357c6b4cf07c327' \ + '29fcbde95364fa2fe08f33d32ab00c8c3a41e2a8') } From crazy at frugalware.org Mon Dec 4 22:52:41 2006 From: crazy at frugalware.org (crazy) Date: Mon Dec 4 22:52:57 2006 Subject: [Frugalware-darcs] frugalware-current: kerry-0.2.1-1-i686 Message-ID: <20061204215243.A63EFFA4704@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204214500-f6986-e3c958fbc41911e293015a314ab69fbb9beeae43.gz; [kerry-0.2.1-1-i686 crazy **20061204214500 * Version bump * dropped 'beagle' from depends() ( jaja I know should be a rodepend now but I _don't_ want to make kde-extra pull gnome again , damn this beagle is crap ) ] { hunk ./source/kde-extra/kerry/FrugalBuild 5 -pkgver=0.2 +pkgver=0.2.1 hunk ./source/kde-extra/kerry/FrugalBuild 11 -depends=('kdebase>=3.5.5' 'beagle>=0.2.6-3' 'libbeagle>=0.2.6-3') +depends=('kdebase>=3.5.5' 'libbeagle>=0.2.6-3') hunk ./source/kde-extra/kerry/FrugalBuild 16 -sha1sums=('3016ef495194d5aaa6bf4c28ada43eaa034d14b9') +sha1sums=('d94d7646725aaaaed9b9d2dd0ce95f6473e6b935') } From vmiklos at frugalware.org Mon Dec 4 22:58:05 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 22:58:09 2006 Subject: [Frugalware-darcs] pacman-tools: rf: -c deletes the source, too Message-ID: <20061204215805.DCFA5FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman-tools;a=darcs_commitdiff;h=20061204215514-e2957-cc0dae65b3f432ce787e150dfeb807cbc885733a.gz; [rf: -c deletes the source, too VMiklos **20061204215514 this restores the old "rf -f *fpm" behavour, which is used in many places so -c is about to delte the sources, too from now ] { hunk ./rf 120 - Try to delete only .fpm files + Try to delete the sources, too. hunk ./rf 673 - unless ($opts{'c'}){ + if ($opts{'c'}){ } From vmiklos at frugalware.org Mon Dec 4 23:01:22 2006 From: vmiklos at frugalware.org (VMiklos) Date: Mon Dec 4 23:01:24 2006 Subject: [Frugalware-darcs] frugalware-current: phpmyadmin-2.9.1.1-2-i686 Message-ID: <20061204220122.8CB73FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204211258-e2957-6cb38896e0f817b63e5cbd8ea67e9f02928de9c2.gz; [phpmyadmin-2.9.1.1-2-i686 VMiklos **20061204211258 added missing backup() ] { hunk ./source/network-extra/phpmyadmin/FrugalBuild 6 -pkgrel=1 +pkgrel=2 hunk ./source/network-extra/phpmyadmin/FrugalBuild 12 +backup=(var/www/html/phpmyadmin/libraries/config.default.php) } From crazy at frugalware.org Mon Dec 4 23:12:47 2006 From: crazy at frugalware.org (crazy) Date: Mon Dec 4 23:12:51 2006 Subject: [Frugalware-darcs] frugalware-current: apr-1.2.8-1-i686 Message-ID: <20061204221247.C7DD8FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204220702-f6986-7612dc0593b566ebf1db53e440aa08cb0291e3d0.gz; [apr-1.2.8-1-i686 crazy **20061204220702 * Version bump ] { hunk ./source/network/apr/FrugalBuild 5 -pkgver=1.2.7 +pkgver=1.2.8 hunk ./source/network/apr/FrugalBuild 13 -source=(http://www.wirtschaftsinformatik.fh-furtwangen.de/mirror/apache/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('98fb4d52053ec53a823061f2f906474a26c88633') +source=(http://apache.mirror.iphh.net/$pkgname/$pkgname-$pkgver.tar.gz) +Fconfopts="$Fconfopts --with-gnu-ld --with-threads --enable-layout=RedHat" +sha1sums=('b8c89bab084d1bae1cb15d7b9d5f40d03dfe2c4a') hunk ./source/network/apr/FrugalBuild 17 -build() -{ - Fbuild --with-gnu-ld --with-threads --enable-layout=RedHat -} - -# optimalization OK +# optimization OK } From crazy at frugalware.org Mon Dec 4 23:23:09 2006 From: crazy at frugalware.org (crazy) Date: Mon Dec 4 23:23:14 2006 Subject: [Frugalware-darcs] frugalware-current: apr-util-1.2.8-1-i686 Message-ID: <20061204222309.BCE9FFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204221905-f6986-90627afb5c90f73dcc114893077335e928ea726d.gz; [apr-util-1.2.8-1-i686 crazy **20061204221905 * Version bump ] { hunk ./source/network/apr-util/FrugalBuild 5 -pkgver=1.2.7 -pkgrel=2 +pkgver=1.2.8 +pkgrel=1 hunk ./source/network/apr-util/FrugalBuild 9 -depends=('apr=1.2.7' 'db>=4.5.20' 'gdbm' 'expat') +depends=('apr=1.2.8' 'db>=4.5.20' 'gdbm' 'expat') hunk ./source/network/apr-util/FrugalBuild 13 -source=(http://www.artfiles.org/apache.org/apr/$pkgname-$pkgver.tar.bz2) +source=(http://apache.mirror.iphh.net/apr/$pkgname-$pkgver.tar.bz2) hunk ./source/network/apr-util/FrugalBuild 20 +sha1sums=('cef58fe4c282e7b449cd49d568914c8f4ee7cdc9') + hunk ./source/network/apr-util/FrugalBuild 23 -sha1sums=('1b25cf401f21e404f1a9ecded77bc6e0c484d441') + } From crazy at frugalware.org Mon Dec 4 23:46:03 2006 From: crazy at frugalware.org (crazy) Date: Mon Dec 4 23:46:06 2006 Subject: [Frugalware-darcs] frugalware-current: kicker-compiz-0.2-1-i686 Message-ID: <20061204224603.BAE92FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204224122-f6986-ff9101ef91fc67ae6f59a3bbf3ea3636e7cbdd56.gz; [kicker-compiz-0.2-1-i686 crazy **20061204224122 * New package ] { adddir ./source/kde-extra/kicker-compiz addfile ./source/kde-extra/kicker-compiz/FrugalBuild hunk ./source/kde-extra/kicker-compiz/FrugalBuild 1 +# Compiling Time: 0.60 SBU +# Maintainer: crazy + +pkgname=kicker-compiz +pkgver=0.2 +pkgrel=1 +pkgdesc="Modified pager applet for kicker to make it work with compiz." +depends=('kdebase>=3.5.5') +_F_kdeapps_id="46021" +Finclude kdeapps +options=('scriptlet') +groups=('kde-extra') +archs=('i686') +## hrmm +source=(http://www.kde-apps.org/content/files/46021-$pkgname-3.5.4.tar.gz) +_F_cd_path="$pkgname-3.5.4" +sha1sums=('9d61590c5b296a4255153ea5901ff1b0e1184a0e') + +# optimization OK } From crazy at frugalware.org Tue Dec 5 00:04:06 2006 From: crazy at frugalware.org (crazy) Date: Tue Dec 5 00:04:10 2006 Subject: [Frugalware-darcs] frugalware-current: taskbar-compiz-0.1-1-i686 Message-ID: <20061204230406.89616FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204230037-f6986-e74e1bd0874605ec85241bc5fe4230c5397519cb.gz; [taskbar-compiz-0.1-1-i686 crazy **20061204230037 * New package ] { adddir ./source/kde-extra/taskbar-compiz addfile ./source/kde-extra/taskbar-compiz/FrugalBuild hunk ./source/kde-extra/taskbar-compiz/FrugalBuild 1 +# Compiling Time: 0.48 SBU +# Maintainer: crazy + +pkgname=taskbar-compiz +pkgver=0.1 +pkgrel=1 +pkgdesc="Modified taskbar applet for kicker to make it work with compiz." +depends=('kdebase>=3.5.5') +_F_kdeapps_id="49484" +Finclude kdeapps +options=('scriptlet') +groups=('kde-extra') +archs=('i686') +source=(http://de.kde-apps.org/content/files/49484-$pkgname.tar.gz) +_F_cd_path="$pkgname" +sha1sums=('6e7b780f4d93d87658ba251d3a0fdb9a67848b98') + +# optimization OK } From crazy at frugalware.org Tue Dec 5 00:23:01 2006 From: crazy at frugalware.org (crazy) Date: Tue Dec 5 00:23:08 2006 Subject: [Frugalware-darcs] frugalware-current: apache-2.2.3-3-i686 Message-ID: <20061204232302.040BDFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204231922-f6986-67a4116301fe94eac0cdc036ad04cfc3fc08b293.gz; [apache-2.2.3-3-i686 crazy **20061204231922 * just rebuild with apr* ] { hunk ./source/network/apache/FrugalBuild 7 -pkgrel=2 +pkgrel=3 hunk ./source/network/apache/FrugalBuild 12 -depends=('gdbm' 'db>=4.5.20' 'openssl' 'expat' 'apr-util') +depends=('gdbm' 'db>=4.5.20' 'openssl' 'expat' 'apr-util>=1.2.8') } From vmiklos at frugalware.org Tue Dec 5 00:33:54 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:09 2006 Subject: [Frugalware-darcs] frugalware-current: frostwire-4.10.9-1-i686 Message-ID: <20061204233354.CD4B4FA4705@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204225543-e2957-4b33271b3df9c19a52bd4c77407fd77fa5c4f2b6.gz; [frostwire-4.10.9-1-i686 VMiklos **20061204225543 use Finclude sourceforge ] { hunk ./source/xapps-extra/frostwire/FrugalBuild 8 +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_name="FrostWire" +Finclude sourceforge hunk ./source/xapps-extra/frostwire/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/FrostWire-$pkgver-1.tar.gz) +source=(${source/$pkgver/$pkgver-1}) } From vmiklos at frugalware.org Tue Dec 5 00:33:53 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:11 2006 Subject: [Frugalware-darcs] frugalware-current: fwbuilder-2.0.12-1-i686 Message-ID: <20061204233353.DF932FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204225857-e2957-c4425f221e08f1b9c6424635717c23607b17a72d.gz; [fwbuilder-2.0.12-1-i686 VMiklos **20061204225857 use Finclude sourceforge ] { hunk ./source/xapps-extra/fwbuilder/FrugalBuild 8 +Finclude sourceforge hunk ./source/xapps-extra/fwbuilder/FrugalBuild 13 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) } From vmiklos at frugalware.org Tue Dec 5 00:33:55 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:12 2006 Subject: [Frugalware-darcs] frugalware-current: freetype1-1.3.1-3-i686 Message-ID: <20061204233355.87972FA4709@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204225415-e2957-c8f81045722d17e0364081f321bf182ce48ed08b.gz; [freetype1-1.3.1-3-i686 VMiklos **20061204225415 use Finclude sourceforge ] { hunk ./source/lib/freetype1/FrugalBuild 9 +_F_sourceforge_name="freetype" +Finclude sourceforge hunk ./source/lib/freetype1/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/freetype/freetype-$pkgver.tar.gz freetype-$pkgver.diff) +source=($source freetype-$pkgver.diff) hunk ./source/lib/freetype1/FrugalBuild 22 - Fcd - Fpatch freetype-$pkgver.diff + Fpatchall } From vmiklos at frugalware.org Tue Dec 5 00:33:55 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:13 2006 Subject: [Frugalware-darcs] frugalware-current: fnlib-0.5-3-i686 Message-ID: <20061204233355.DF02DFA470B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204224853-e2957-28eac338fb802e4490389986d33c943a77e54dcf.gz; [fnlib-0.5-3-i686 VMiklos **20061204224853 use Finclude sourceforge build() -> Fconfopts spelling fix ] { hunk ./source/xlib/fnlib/FrugalBuild 11 +_F_sourceforge_dirname="enlightenment" +Finclude sourceforge hunk ./source/xlib/fnlib/FrugalBuild 15 -source=(http://heanet.dl.sourceforge.net/sourceforge/enlightenment/$pkgname-$pkgver.tar.gz) +Fconfopts="$Fconfopts --sysconfdir=/etc/fnlib" +# optimization OK hunk ./source/xlib/fnlib/FrugalBuild 19 -build() -{ - Fbuild --sysconfdir=/etc/fnlib -} - -# optimalization OK - } From vmiklos at frugalware.org Tue Dec 5 00:33:55 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:13 2006 Subject: [Frugalware-darcs] frugalware-current: gaim-plugin-guifications-2.13beta3-1-i686 Message-ID: <20061204233355.414E5FA4707@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204232833-e2957-4dd07f5e793001e1153e3f8e7f10491ac79c737a.gz; [gaim-plugin-guifications-2.13beta3-1-i686 VMiklos **20061204232833 use Finclude sourceforge ] { hunk ./source/xapps/gaim-plugin-guifications/FrugalBuild 7 -realname=gaim-guifications hunk ./source/xapps/gaim-plugin-guifications/FrugalBuild 8 -url="http://guifications.sourceforge.net/" +_F_sourceforge_dirname="guifications" +_F_sourceforge_name="gaim-guifications" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/xapps/gaim-plugin-guifications/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/guifications/$realname-$pkgver.tar.bz2) -_F_cd_path="$realname-$pkgver" +_F_cd_path="$_F_sourceforge_name-$pkgver" } From vmiklos at frugalware.org Tue Dec 5 00:33:56 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:14 2006 Subject: [Frugalware-darcs] frugalware-current: fte-20051115-1-i686 Message-ID: <20061204233356.86AE5FA470F@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204225829-e2957-bb2c6bd838f2b18075ae284b45c645e87e07e4c5.gz; [fte-20051115-1-i686 VMiklos **20061204225829 use Finclude sourceforge ] { hunk ./source/xapps-extra/fte/FrugalBuild 9 +_F_sourceforge_ext=".zip" +Finclude sourceforge hunk ./source/xapps-extra/fte/FrugalBuild 17 -source=(http://heanet.dl.sourceforge.net/sourceforge/fte/$pkgname-$pkgver-common.zip \ - http://heanet.dl.sourceforge.net/sourceforge/fte/$pkgname-$pkgver-src.zip) +source=(${source/.zip/-common.zip} ${source/.zip/-src.zip}) } From vmiklos at frugalware.org Tue Dec 5 00:33:56 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:15 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-schedule-1.0.1-1-i686 Message-ID: <20061204233356.3984AFA470C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204232950-e2957-d68b7c5310711dc47ec046e896ce3dd75b6bab0b.gz; [gnome-schedule-1.0.1-1-i686 VMiklos **20061204232950 use Finclude sourceforge ] { hunk ./source/gnome-extra/gnome-schedule/FrugalBuild 9 -url="http://gnome-schedule.sourceforge.net/" hunk ./source/gnome-extra/gnome-schedule/FrugalBuild 10 -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=112183'|grep -m 1 -o 'gnome-schedule-[0-9\.]\+[0-9]'|grep -o '[0-9\.]\+[0-9]'" -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) hunk ./source/gnome-extra/gnome-schedule/FrugalBuild 13 -Finclude gnome-scriptlet +Finclude gnome-scriptlet sourceforge +up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=112183'|grep -m 1 -o 'gnome-schedule-[0-9\.]\+[0-9]'|grep -o '[0-9\.]\+[0-9]'" } From vmiklos at frugalware.org Tue Dec 5 00:33:58 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:16 2006 Subject: [Frugalware-darcs] frugalware-current: fluxbox-1.0rc2-1-i686 Message-ID: <20061204233359.BB3FBFA4710@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204224625-e2957-672fc12d723219f114279a24c8c0d40c42a241e9.gz; [fluxbox-1.0rc2-1-i686 VMiklos **20061204224625 use Finclude sourceforge ] { hunk ./source/x11-extra/fluxbox/FrugalBuild 9 +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/x11-extra/fluxbox/FrugalBuild 17 -source=(http://heanet.dl.sourceforge.net/sourceforge/fluxbox/$pkgname-$pkgver.tar.bz2 \ - $pkgname.desktop xinitrc.$pkgname) +source=($source $pkgname.desktop xinitrc.$pkgname) } From vmiklos at frugalware.org Tue Dec 5 00:34:01 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:17 2006 Subject: [Frugalware-darcs] frugalware-current: fxload-2002_04_11-1-i686 Message-ID: <20061204233404.1796DFA470A@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204232437-e2957-696bd4f7313ed3b5c1b499558859e886f845ec48.gz; [fxload-2002_04_11-1-i686 VMiklos **20061204232437 inherit source() from sourceforge.sh ] { hunk ./source/base-extra/fxload/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/linux-hotplug/$pkgname-$pkgver.tar.gz) +source=(`echo $source|sed "s/${pkgver//_/-}/$pkgver/"`) hunk ./source/base-extra/fxload/FrugalBuild 28 -# optimalization OK +# optimization OK } From vmiklos at frugalware.org Tue Dec 5 00:34:04 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 00:34:18 2006 Subject: [Frugalware-darcs] frugalware-current: gaim-plugin-extendedprefs-0.5-1-i686 Message-ID: <20061204233405.3A3E2FA470C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061204232628-e2957-9534dd47d676e722e8f3df25708630a46f866cb3.gz; [gaim-plugin-extendedprefs-0.5-1-i686 VMiklos **20061204232628 use Finclude sourceforge ] { hunk ./source/xapps/gaim-plugin-extendedprefs/FrugalBuild 7 -pkgrealname=gaim-extprefs hunk ./source/xapps/gaim-plugin-extendedprefs/FrugalBuild 8 -url="http://gaim-extprefs.sourceforge.net/" +_F_sourceforge_name="gaim-extprefs" +Finclude sourceforge hunk ./source/xapps/gaim-plugin-extendedprefs/FrugalBuild 13 -up2date="lynx -dump 'http://sourceforge.net/project/showfiles.php?group_id=107659&package_id=116164' | grep \"$pkgrealname-.*.tar.\(gz\|bz2\)\" | head -n 1 | sed 's/.*-\(.*\)\.t.*/\1/'" -source=(http://heanet.dl.sourceforge.net/$pkgrealname/$pkgrealname-$pkgver.tar.gz) hunk ./source/xapps/gaim-plugin-extendedprefs/FrugalBuild 16 - Fcd $pkgrealname-$pkgver + Fcd $_F_sourceforge_name-$pkgver hunk ./source/xapps/gaim-plugin-extendedprefs/FrugalBuild 21 -# optimalization OK - -# vim: ft=sh +# optimization OK } From vmiklos at frugalware.org Tue Dec 5 01:59:43 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 01:59:46 2006 Subject: [Frugalware-darcs] frugalwareutils: fwnetconfig: new directive: mode Message-ID: <20061205005943.8D567FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalwareutils;a=darcs_commitdiff;h=20061205004842-e2957-60f54f862ed2a5f259ec3929751182c49a224dbf.gz; [fwnetconfig: new directive: mode VMiklos **20061205004842] { hunk ./libfwnetconfig/libfwnetconfig.c 182 + if(!strcmp(var, "MODE") && !strlen(iface->mode)) + strncpy(iface->mode, ptr, FWNET_MODE_MAX_SIZE); hunk ./libfwnetconfig/libfwnetconfig.c 362 + if(strlen(iface->mode)) + { + ptr = g_strdup_printf("iwconfig %s mode %s", iface->name, iface->mode); + ret += fwutil_system(ptr); + FWUTIL_FREE(ptr); + } hunk ./libfwnetconfig/libfwnetconfig.c 665 + if(iface->mode != NULL && strlen(iface->mode)) + fprintf(fp, "mode = %s\n", iface->mode); hunk ./libfwnetconfig/libfwnetconfig.h 27 +#define FWNET_MODE_MAX_SIZE 32 hunk ./libfwnetconfig/libfwnetconfig.h 46 + char mode[FWNET_MODE_MAX_SIZE+1]; hunk ./netconfig/doc/netconfig.5 76 +.TP +.B "mode = " +Set the operating mode of the device, for wireless network adapters. The mode +can be Ad- Hoc (network composed of only one cell and without Access +Point), Managed (node connects to a network composed of many Access Points, +with roaming), Master (the node is the synchronisation master or acts as +an Access Point), Repeater (the node forwards packets between other wireless +nodes), Secondary (the node acts as a backup master/repeater), Monitor (the +node is not associ- ated with any cell and passively monitor all packets on +the frequency) or Auto. If defined more than once, the first will be used. } From crazy at frugalware.org Tue Dec 5 02:41:56 2006 From: crazy at frugalware.org (crazy) Date: Tue Dec 5 02:42:00 2006 Subject: [Frugalware-darcs] frugalware-current: subversion-1.4.2-1-i686 Message-ID: <20061205014156.2A2C0FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205013537-f6986-25fbccaa4caf7ff01d1f34c72d3d073b0aae577f.gz; [subversion-1.4.2-1-i686 crazy **20061205013537 * Version bump * fix for dirs and file permissions * fixed subdepends() * rebuild with apr* * some build() fixes ] { hunk ./source/devel-extra/subversion/neon26.patch 1 -diff -Naur subversion-1.4.0/build/ac-macros/neon.m4 subversion-1.4.0-p/build/ac-macros/neon.m4 ---- subversion-1.4.0/build/ac-macros/neon.m4 2006-01-07 01:56:50.000000000 +0100 -+++ subversion-1.4.0-p/build/ac-macros/neon.m4 2006-09-26 17:21:35.886018022 +0200 -@@ -50,9 +50,13 @@ - NEON_VERSION=`cat $abs_srcdir/neon/.version` - AC_MSG_RESULT([$NEON_VERSION]) - -- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then -+ if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1], -- [Defined if have Neon 0.25.x instead of 0.24.7.]) -+ [Define to 1 if you have Neon 0.25 or later.]) -+ fi -+ if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then -+ AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], -+ [Define to 1 if you have Neon 0.26 or later.]) - fi - - for svn_allowed_neon in $NEON_ALLOWED_LIST; do -@@ -123,9 +127,13 @@ - NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` - AC_MSG_RESULT([$NEON_VERSION]) - -- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then -+ if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then - AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1], -- [Defined if have Neon 0.25.x instead of 0.24.7.]) -+ [Define to 1 if you have Neon 0.25 or later.]) -+ fi -+ if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then -+ AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], -+ [Define to 1 if you have Neon 0.26 or later.]) - fi - - for svn_allowed_neon in $NEON_ALLOWED_LIST; do -diff -Naur subversion-1.4.0/configure.in subversion-1.4.0-p/configure.in ---- subversion-1.4.0/configure.in 2006-07-13 15:48:48.000000000 +0200 -+++ subversion-1.4.0-p/configure.in 2006-09-26 17:21:35.887017870 +0200 -@@ -69,8 +69,8 @@ - - # Either a space-separated list of allowable Neon versions, or "any" to - # mean allow anything. --NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5" --NEON_LATEST_WORKING_VER=0.25.5 -+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.1" -+NEON_LATEST_WORKING_VER=0.26.1 - NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz" - dnl You can skip the neon version check only if you know what you are doing - AC_ARG_ENABLE(neon-version-check, -diff -Naur subversion-1.4.0/subversion/libsvn_ra_dav/session.c subversion-1.4.0-p/subversion/libsvn_ra_dav/session.c ---- subversion-1.4.0/subversion/libsvn_ra_dav/session.c 2006-03-25 19:01:16.000000000 +0100 -+++ subversion-1.4.0-p/subversion/libsvn_ra_dav/session.c 2006-09-26 17:21:35.888017718 +0200 -@@ -1448,7 +1448,11 @@ - static void - lock_receiver(void *userdata, - const struct ne_lock *lock, -+#ifdef SVN_NEON_0_26 -+ const ne_uri *uri, -+#else - const char *uri, -+#endif - const ne_status *status) - { - struct receiver_baton *rb = userdata; rmfile ./source/devel-extra/subversion/neon26.patch hunk ./source/devel-extra/subversion/FrugalBuild 5 -pkgver=1.4.0 -pkgrel=5 +pkgver=1.4.2 +pkgrel=1 hunk ./source/devel-extra/subversion/FrugalBuild 9 -depends=('neon>=0.26.1' 'apr-util>=1.2.7-2' 'apr') +depends=('neon>=0.26.1' 'apr-util>=1.2.8' 'apr>=1.2.8') hunk ./source/devel-extra/subversion/FrugalBuild 15 - mod_dav_svn.conf neon26.patch) -sha1sums=('92671bba140e9b9e300b5ffb526c4a7c59aeb5b1' \ + mod_dav_svn.conf) +sha1sums=('349847a97ad790cb14ad15bfd7bfe5bc5a9c8837' \ hunk ./source/devel-extra/subversion/FrugalBuild 18 - 'b4012364a9fbd9e8c490a4819780c31c67940428' \ - '251947ca57ca5a35c84179c9d8ef927b17b58e15') + 'b4012364a9fbd9e8c490a4819780c31c67940428') hunk ./source/devel-extra/subversion/FrugalBuild 20 -subpkgs=('mod_svn' 'subversion-svnserve' 'subversion-bindings') +subpkgs=('mod_svn' "$pkgname-svnserve" "$pkgname-bindings") hunk ./source/devel-extra/subversion/FrugalBuild 24 -subdepends=('apache subversion' 'subversion' 'subversion perl python ruby swig') +subdepends=("apache $pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver perl python ruby swig") hunk ./source/devel-extra/subversion/FrugalBuild 34 - - Fpatchall + Fcd + # lol :D + Fsed "103029" "103031" build/ac-macros/swig.m4 hunk ./source/devel-extra/subversion/FrugalBuild 38 - Fmake --disable-experimental-libtool --disable-debug \ - --disable-mod-activation --enable-dso --with-neon=/usr \ - --with-ssl --with-swig=/usr - Fmakeinstall + Fbuild \ + --disable-experimental-libtool \ + --disable-debug \ + --disable-mod-activation \ + --enable-dso \ + --with-neon=/usr \ + --with-ssl \ + --with-swig=/usr \ + --disable-neon-version-check hunk ./source/devel-extra/subversion/FrugalBuild 84 + ## Fix permissions + Fdirschmod usr/share/doc/$pkgname-$pkgver/doc 0755 + Fdirschmod usr/share/subversion/hook-scripts 0755 + Fdirschmod usr/share/subversion/dev 0755 + Ffileschmod usr/share/doc/$pkgname-$pkgver/doc 0644 + Ffileschmod usr/share/subversion/hook-scripts 0644 + Ffileschmod usr/share/subversion/dev 0644 hunk ./source/devel-extra/subversion/FrugalBuild 92 - Fsplit subversion-svnserve etc/rc.d - Fsplit subversion-svnserve usr/bin/svnserve - Fsplit subversion-svnserve usr/man/man8/svnserve* - Fsplit subversion-svnserve usr/man/man5/svnserve* + Fsplit $pkgname-svnserve etc/rc.d + Fsplit $pkgname-svnserve usr/bin/svnserve + Fsplit $pkgname-svnserve usr/man/man8/svnserve* + Fsplit $pkgname-svnserve usr/man/man5/svnserve* hunk ./source/devel-extra/subversion/FrugalBuild 100 - Fsplit subversion-bindings usr/lib/perl5/ - Fsplit subversion-bindings $_F_python_libdir - Fsplit subversion-bindings usr/lib/ruby/ - Fsplit subversion-bindings usr/lib/libsvn_swig* - Fsplit subversion-bindings usr/man/man3/SVN* + # - TODO - split the bindings in perl | ruby etc and readd java - crazy - + Fsplit $pkgname-bindings usr/lib/perl5/ + Fsplit $pkgname-bindings $_F_python_libdir + Fsplit $pkgname-bindings usr/lib/ruby/ + Fsplit $pkgname-bindings usr/lib/libsvn_swig* + Fsplit $pkgname-bindings usr/man/man3/SVN* } From krics at linuxforum.hu Tue Dec 5 08:13:59 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:14:02 2006 Subject: [Frugalware-darcs] xorg-mess: xorg-mess: point xorg-mess repo to 7.2-RC2 Message-ID: <20061205071359.56AE9FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205071434-d209c-cafc51afbd9685509aae753d57c1e56eeb692bc4.gz; [xorg-mess: point xorg-mess repo to 7.2-RC2 Christian Hamar alias krix **20061205071434] { hunk ./source/include/xorg.sh 27 -dlurl="$url/releases/individual/$_F_xorg_dir/" +#dlurl="$url/releases/individual/$_F_xorg_dir/" +dlurl="http://xorg.freedesktop.org/archive/development/X11R7.2-RC3/everything/" } From krics at linuxforum.hu Tue Dec 5 08:22:14 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:22:16 2006 Subject: [Frugalware-darcs] xorg-mess: compositeproto-0.3.1-1-x86_64 Message-ID: <20061205072214.8BAF8FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205072256-d209c-1abbd58cfd6be9d0a36413f94525840547346ba4.gz; [compositeproto-0.3.1-1-x86_64 Christian Hamar alias krix **20061205072256 * Version bump (7.2 RC2) ] { hunk ./source/x11/compositeproto/FrugalBuild 5 -pkgver=0.3 +pkgver=0.3.1 hunk ./source/x11/compositeproto/FrugalBuild 7 -pkgdesc="X.Org composite protocol headers" +pkgdesc="X.Org Composite extension headers" hunk ./source/x11/compositeproto/FrugalBuild 14 -sha1sums=('7e517a4ecb5059036e38063bce9281f03464b407') +sha1sums=('fc89dfc3f92628e437f2f45286d00e92530768a8') } From krics at linuxforum.hu Tue Dec 5 08:24:37 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:24:39 2006 Subject: [Frugalware-darcs] xorg-mess: xcb-proto-1.0-1-x86_64 Message-ID: <20061205072437.9BB23FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205072529-d209c-faac8ab4fd95230d201d7b9a2016de66b0533830.gz; [xcb-proto-1.0-1-x86_64 Christian Hamar alias krix **20061205072529 * Version bump ] { hunk ./source/x11/xcb-proto/FrugalBuild 5 -pkgver=0.9.93 +pkgver=1.0 hunk ./source/x11/xcb-proto/FrugalBuild 15 -sha1sums=('c3a0a5ecc6c602c948d164b186967eb715e872e6') +sha1sums=('c7252cc74f75c997227b4dcdba2cb654d89cecda') } From krics at linuxforum.hu Tue Dec 5 08:26:43 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:26:44 2006 Subject: [Frugalware-darcs] xorg-mess: util-macros-1.1.3-1-x86_64 Message-ID: <20061205072643.A575DFA4704@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205072734-d209c-0dd6f7a99631b28ea753b91fa97c0136b6433a46.gz; [util-macros-1.1.3-1-x86_64 Christian Hamar alias krix **20061205072734 * Version bump ] { hunk ./source/x11/util-macros/FrugalBuild 5 -pkgver=1.1.2 +pkgver=1.1.3 hunk ./source/x11/util-macros/FrugalBuild 14 -sha1sums=('c46fa7da7cccf10d374e2e7025cecb16b99672de') +sha1sums=('333e9cb77fea35231cc9aac23a5cbc21f81ca867') } From krics at linuxforum.hu Tue Dec 5 08:29:39 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:29:41 2006 Subject: [Frugalware-darcs] xorg-mess: font-screen-cyrillic-1.0.1-1-x86_64 Message-ID: <20061205072939.6C676FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205073016-d209c-2d0581bd0cf0367416d8c3bda595cc1430d7ff4d.gz; [font-screen-cyrillic-1.0.1-1-x86_64 Christian Hamar alias krix **20061205073016 * Version bump * makedepends on util-macros (because of autoreconfing) ] { hunk ./source/x11/font-screen-cyrillic/FrugalBuild 5 -pkgver=1.0.0 +pkgver=1.0.1 hunk ./source/x11/font-screen-cyrillic/FrugalBuild 12 -makedepends=('pkgconfig' 'bdftopcf') +makedepends=('pkgconfig' 'bdftopcf' 'util-macros>=1.1.3') hunk ./source/x11/font-screen-cyrillic/FrugalBuild 16 +sha1sums=('d6eb7c366ab1cb8198df93aa661f295ebe09669f' \ + '84d377ebafea8d3df2d9076119f1f669bdc1b860') hunk ./source/x11/font-screen-cyrillic/FrugalBuild 27 -# optimalization OK - -# vim: ft=sh -sha1sums=('f6e02e5f8edc7a40051dc08739929bc8ac75e7d3' \ - '84d377ebafea8d3df2d9076119f1f669bdc1b860') - } From krics at linuxforum.hu Tue Dec 5 08:31:04 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:31:05 2006 Subject: [Frugalware-darcs] xorg-mess: xorg-sgml-doctools-1.1.1-1-x86_64 Message-ID: <20061205073104.CD4D7FA4704@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205073153-d209c-0b33dbf2738dc01af072836fc79f1d0cc7a6b396.gz; [xorg-sgml-doctools-1.1.1-1-x86_64 Christian Hamar alias krix **20061205073153 * Version bump ] { hunk ./source/x11/xorg-sgml-doctools/FrugalBuild 5 -pkgver=1.1 +pkgver=1.1.1 hunk ./source/x11/xorg-sgml-doctools/FrugalBuild 13 -sha1sums=('f9bb1f5e324e7687a221cdd34387db39a94b3396') +sha1sums=('c8199c214be2ebc62407d0f5347f30d1346f6781') } From krics at linuxforum.hu Tue Dec 5 08:40:58 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:41:00 2006 Subject: [Frugalware-darcs] xorg-mess: xorg-docs-1.3-1-x86_64 Message-ID: <20061205074058.52D42FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205074145-d209c-856aa45b94bc9b34457f9c93ecc6a3e97b62fafd.gz; [xorg-docs-1.3-1-x86_64 Christian Hamar alias krix **20061205074145 * Version bump ] { hunk ./source/x11/xorg-docs/FrugalBuild 5 -pkgver=1.2 +pkgver=1.3 hunk ./source/x11/xorg-docs/FrugalBuild 12 -makedepends=('xorg-sgml-doctools>=1.1') +makedepends=('xorg-sgml-doctools>=1.1.1') hunk ./source/x11/xorg-docs/FrugalBuild 14 -sha1sums=('867de1f1bc07faaf58fdc8bb7f8b215a7e272f61') +sha1sums=('a82634e02a26e7d3b440f67d3481a599c7990cfc') } From krics at linuxforum.hu Tue Dec 5 08:44:28 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:44:30 2006 Subject: [Frugalware-darcs] xorg-mess: libpthread-stubs-0.1-1-x86_64 Message-ID: <20061205074429.1F347FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205074517-d209c-3881c925b726e2da9fa69c6bbd02daa7beda73f7.gz; [libpthread-stubs-0.1-1-x86_64 Christian Hamar alias krix **20061205074517 * New package for XCB* ] { adddir ./source/x11/libpthread-stubs addfile ./source/x11/libpthread-stubs/FrugalBuild hunk ./source/x11/libpthread-stubs/FrugalBuild 1 +# Compiling Time: 0.01 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=libpthread-stubs +pkgver=0.1 +pkgrel=1 +pkgdesc="X.org Stubs missing from libc for standard pthread functions" +url="http://xcb.freedesktop.org" +groups=('x11' 'xorg-core' 'xorg-proto') +depends=('glibc') +archs=('i686' 'x86_64') +up2date=("lynx -dump 'http://xcb.freedesktop.org/dist/?C=M;O=A' | grep libpthread-stubs | Flasttar") +source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2) +sha1sums=('34ef40880d0112dc6d32b386d59ce94f2c139eef') } From krics at linuxforum.hu Tue Dec 5 08:47:52 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:47:58 2006 Subject: [Frugalware-darcs] xorg-mess: inputproto-1.3.2-1-x86_64 Message-ID: <20061205074753.6031BFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205074831-d209c-085552d91cae908d9180f18771d4942bbdad5793.gz; [inputproto-1.3.2-1-x86_64 Christian Hamar alias krix **20061205074831 * Downgrade version (7.2 RC2 wants 1.3.X) ] { hunk ./source/x11/inputproto/FrugalBuild 5 -pkgver=1.4 +pkgver=1.3.2 hunk ./source/x11/inputproto/FrugalBuild 13 +force="y" hunk ./source/x11/inputproto/FrugalBuild 15 -sha1sums=('020e0bde3719eb28b04add396ca2532b6c5c0082') +sha1sums=('61d83e6d273a71afbec8a5183bd0f1e13b68ad9f') } From krics at linuxforum.hu Tue Dec 5 08:57:19 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 08:57:22 2006 Subject: [Frugalware-darcs] xorg-mess: libxcb-1.0-1-x86_64 Message-ID: <20061205075719.5179FFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205075808-d209c-134564cf123279ee0bbd30035f0b9d7cc7a55acd.gz; [libxcb-1.0-1-x86_64 Christian Hamar alias krix **20061205075808 * Version bump ] { hunk ./source/x11/libxcb/FrugalBuild 5 -pkgver=0.9.93 +pkgver=1.0 hunk ./source/x11/libxcb/FrugalBuild 10 -depends=('xcb-proto' 'libxml2' 'libxau' 'libxdmcp' 'libxslt') +depends=('xcb-proto>=1.0' 'libpthread-stubs' 'libxml2' 'libxau' 'libxdmcp' 'libxslt') hunk ./source/x11/libxcb/FrugalBuild 15 -sha1sums=('169b0d579895beb527c3df8ff4ec2bf4326c3333') -Fconfopts="$Fconfopts --without-debug" +sha1sums=('0a7e0b65e6f1e0ef4dcaecaa01c4b2854206e96e') + +build() { + Fbuild + Fmv /usr/share/doc/$pkgname/tutorial /usr/share/doc/$pkgname-$pkgver/ +} } From krics at linuxforum.hu Tue Dec 5 09:06:54 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 09:06:55 2006 Subject: [Frugalware-darcs] xorg-mess: libx11-1.1.1-1-x86_64 Message-ID: <20061205080654.A66E5FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205080744-d209c-3cfb20cdfff5bc3fe00efeaf5cf107a779193dca.gz; [libx11-1.1.1-1-x86_64 Christian Hamar alias krix **20061205080744 * Version bump ] { hunk ./source/x11/libx11/FrugalBuild 6 -pkgver=1.0.99.2 +pkgver=1.1.1 hunk ./source/x11/libx11/FrugalBuild 12 -depends=('xproto' 'libxdmcp' 'xtrans>=1.0.2' 'kbproto' 'libxau' 'libxcb') +depends=('xproto' 'libxdmcp' 'xtrans>=1.0.2' 'kbproto' 'libxau' 'libxcb>=1.0') hunk ./source/x11/libx11/FrugalBuild 14 - 'xextproto' 'xcmiscproto' 'inputproto' 'util-macros>=1.1.2') + 'xextproto' 'xcmiscproto' 'inputproto=1.3.2' 'util-macros>=1.1.3') hunk ./source/x11/libx11/FrugalBuild 16 -source=($source) hunk ./source/x11/libx11/FrugalBuild 18 -sha1sums=('fac2945814988defec2a7213270f1ff07f5c9510' \ - 'df96b8aa9fb4333c010f6b15c39b5a694e9e26a0') +sha1sums=('048dc3d850666010e81a86bbe0960a643557251a') } From krics at linuxforum.hu Tue Dec 5 09:13:30 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 09:13:35 2006 Subject: [Frugalware-darcs] xorg-mess: libxfont-1.2.5-1-x86_64 Message-ID: <20061205081330.87CDEFA4706@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205081410-d209c-198cbae6911408312830a831e6cb4873b88b3dd9.gz; [libxfont-1.2.5-1-x86_64 Christian Hamar alias krix **20061205081410 * Version bump * Removed --enable-cid (because CID was removed from upstream) ] { hunk ./source/x11/libxfont/FrugalBuild 6 -pkgver=1.2.3 +pkgver=1.2.5 hunk ./source/x11/libxfont/FrugalBuild 15 -sha1sums=('97aed7a88c43086a816a3586d08e9ed17411d6d9') +sha1sums=('d30d9ea313ea8cee02bcfca960d3987411e4d8a1') hunk ./source/x11/libxfont/FrugalBuild 18 ---enable-pcfformat --enable-bdfformat --enable-snfformat --enable-cid" +--enable-pcfformat --enable-bdfformat --enable-snfformat" } From krics at linuxforum.hu Tue Dec 5 09:16:50 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 09:16:53 2006 Subject: [Frugalware-darcs] xorg-mess: libxfixes-4.0.3-1-x86_64 Message-ID: <20061205081651.19991FA4705@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205081736-d209c-c158223b2809363c365f4fd7f044cfc7f3b643ab.gz; [libxfixes-4.0.3-1-x86_64 Christian Hamar alias krix **20061205081736 * Version bump ] { hunk ./source/x11/libxfixes/FrugalBuild 6 -pkgver=4.0 +pkgver=4.0.3 hunk ./source/x11/libxfixes/FrugalBuild 12 -depends=('libx11' 'fixesproto>=4.0' 'xproto' 'xextproto') +depends=('libx11>=1.1.1' 'fixesproto>=4.0' 'xproto' 'xextproto') hunk ./source/x11/libxfixes/FrugalBuild 15 -sha1sums=('bbbf4384d3782193f3ea680747bef468b93c997b') +sha1sums=('37297e64239e1cc2a7b4372e27c5f9325f9f29dc') } From krics at linuxforum.hu Tue Dec 5 09:19:04 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 09:19:07 2006 Subject: [Frugalware-darcs] xorg-mess: xfs-1.0.4-1-x86_64 Message-ID: <20061205081905.0E134FA4705@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205081952-d209c-2760e72f37fbd59f71405e9a0d950d8d2653fe4d.gz; [xfs-1.0.4-1-x86_64 Christian Hamar alias krix **20061205081952 * Version bump ] { hunk ./source/x11/xfs/FrugalBuild 5 -pkgver=1.0.3 +pkgver=1.0.4 hunk ./source/x11/xfs/FrugalBuild 11 -depends=('libfs' 'libxfont>=1.2.3') +depends=('libfs' 'libxfont>=1.2.5') hunk ./source/x11/xfs/FrugalBuild 13 -sha1sums=('8ea09473255f02b8c902eb93774c3c77ec877775') +sha1sums=('5c3f82746141250c49d57b5075c3e3ec42e2fd1d') } From krics at linuxforum.hu Tue Dec 5 09:23:14 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 09:23:17 2006 Subject: [Frugalware-darcs] xorg-mess: libxi-1.0.2-1-x86_64 Message-ID: <20061205082314.9DE0BFA4705@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205082356-d209c-8afdb5d571e1982bd5b1aa693119552e428e2e62.gz; [libxi-1.0.2-1-x86_64 Christian Hamar alias krix **20061205082356 * Downgrade because of 7.2 RC2 ] { hunk ./source/x11/libxi/FrugalBuild 6 -pkgver=1.1.0 +pkgver=1.0.2 hunk ./source/x11/libxi/FrugalBuild 12 -depends=('libx11' 'libxext' 'inputproto>=1.4') +depends=('libx11>=1.1.1' 'libxext' 'inputproto=1.3.2') hunk ./source/x11/libxi/FrugalBuild 16 -sha1sums=('8dc380408dfea6357ea68ee375d0c5368d56066f') +sha1sums=('bd830185ffa45017333d0856053ca8ec37d47bae') } From krics at linuxforum.hu Tue Dec 5 09:27:29 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 09:27:31 2006 Subject: [Frugalware-darcs] xorg-mess: libxcomposite-0.3.1-1-x86_64 Message-ID: <20061205082729.853D9FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205082811-d209c-9c923b92d1dfcb834022797ad8886f548189437c.gz; [libxcomposite-0.3.1-1-x86_64 Christian Hamar alias krix **20061205082811 * Version bump ] { hunk ./source/x11/libxcomposite/FrugalBuild 6 -pkgver=0.3 +pkgver=0.3.1 hunk ./source/x11/libxcomposite/FrugalBuild 12 -depends=('libx11' 'libxfixes' 'libxext' 'compositeproto' 'xproto') -makedepends=('pkgconfig' 'inputproto') +depends=('libx11>=1.1.1' 'libxfixes>=4.0.3' 'libxext' 'compositeproto>=0.3.1' 'xproto') +makedepends=('pkgconfig' 'inputproto=1.3.2') hunk ./source/x11/libxcomposite/FrugalBuild 16 -sha1sums=('7367c444ab0f76e415d6822ded6d9bf6454f5d09') +sha1sums=('d5c7883f1d3a98e0fd055226b2a1d4b6ffe5ca54') } From krics at linuxforum.hu Tue Dec 5 09:31:10 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 09:31:12 2006 Subject: [Frugalware-darcs] xorg-mess: sessreg-1.0.2-1-x86_64 Message-ID: <20061205083110.E62A0FA4706@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205083146-d209c-4a53b3f040c2739eb0778f0b2a29dddc67f6014b.gz; [sessreg-1.0.2-1-x86_64 Christian Hamar alias krix **20061205083146 * Version bump * Dropped sed fix patch (in upstream) ] { hunk ./source/x11/sessreg/FrugalBuild 5 -pkgver=1.0.1 +pkgver=1.0.2 hunk ./source/x11/sessreg/FrugalBuild 12 -makedepends=('xproto' 'inputproto' 'libx11' 'util-macros') +makedepends=('xproto' 'inputproto' 'libx11>=1.1.1' 'util-macros>=1.1.3') hunk ./source/x11/sessreg/FrugalBuild 14 -source=($source sessreg-1.0.1-sed-git-fix.patch) -sha1sums=('73e737c1eafce4a5987c0ef53b9a64fcbc0f4a29' \ - '189332a134478dd4a09c2383edaa2656ad2965f4') - -build() { - Fpatchall - Fautoreconf - Fmake - Fmakeinstall -} +sha1sums=('2f2a36967ecffb29461ae28def3b013955e584dd') hunk ./source/x11/sessreg/sessreg-1.0.1-sed-git-fix.patch 1 -From: JĂźrg Billeter -Date: Thu, 9 Nov 2006 12:21:55 +0000 (+0100) -Subject: Fix grep pattern in Makefile.am -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/app/sessreg.git;a=commitdiff;h=37e89cbf2bc3b6266fa47ff1f956d173658bb9a5 - -Fix grep pattern in Makefile.am - -Don't escape | in basic regex mode as it breaks build with GNU grep. ---- - ---- a/Makefile.am -+++ b/Makefile.am -@@ -63,7 +63,7 @@ sessreg.$(APP_MAN_SUFFIX): filenames.sed - - filenames.sed: filenames.sed.c - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's\|__' > $@ -+ $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's|__' > $@ - - if LINT - ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ rmfile ./source/x11/sessreg/sessreg-1.0.1-sed-git-fix.patch } From krics at linuxforum.hu Tue Dec 5 09:33:46 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 09:33:48 2006 Subject: [Frugalware-darcs] xorg-mess: twm-1.0.3-1-x86_64 Message-ID: <20061205083346.233CDFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205083435-d209c-3658e8f4f65988c0301f632ff8798793afd679a2.gz; [twm-1.0.3-1-x86_64 Christian Hamar alias krix **20061205083435 * Version bump ] { hunk ./source/x11/twm/FrugalBuild 5 -pkgver=1.0.2 +pkgver=1.0.3 hunk ./source/x11/twm/FrugalBuild 11 -depends=('libx11>=1.0.99.1' 'libxt>=1.0.3' 'libxmu') +depends=('libx11>=1.1.1' 'libxt' 'libxmu') hunk ./source/x11/twm/FrugalBuild 14 -sha1sums=('9c7ac49c4db26d638312ca9cfe763d11c78a6ef0') +sha1sums=('8e3724f53f8796359705d8e4ff334608bc887f64') } From krics at linuxforum.hu Tue Dec 5 09:42:08 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 09:42:10 2006 Subject: [Frugalware-darcs] xorg-mess: xkeyboard-config-0.9-1-x86_64 Message-ID: <20061205084208.9AA57FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205084252-d209c-d0bc4b923f082f4baa1848712ef7229c84c06af4.gz; [xkeyboard-config-0.9-1-x86_64 Christian Hamar alias krix **20061205084252 * New package (replacement for xkbdata, that is deprecated now :S ) ] { adddir ./source/x11/xkeyboard-config addfile ./source/x11/xkeyboard-config/FrugalBuild hunk ./source/x11/xkeyboard-config/FrugalBuild 1 +# Compiling Time: 0.01 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=xkeyboard-config +pkgver=0.9 +pkgrel=1 +pkgdesc="X.org XML-based XKB configuration registry" +url="http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig" +groups=('x11' 'xorg-core' 'xorg-proto') +depends=('xkbcomp') +provides=('xkbdata') +replaces=('xkbdata') +conflicts=('xkbdata') +archs=('i686' 'x86_64') +makedepends=('pkgconfig' 'perl-xml') +up2date=("lynx -dump 'http://xlibs.freedesktop.org/xkbdesc/?C=M;O=A' | grep $pkgname | Flasttar") +source=(http://xlibs.freedesktop.org/xkbdesc/$pkgname-$pkgver.tar.bz2) +sha1sums=('05139163da656001fd837c6678254665c0d8ca00') +Fconfopts="$Fconfopts --enable-xkbcomp-symlink --enable-compat-rules" } From krics at linuxforum.hu Tue Dec 5 10:04:22 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 10:04:24 2006 Subject: [Frugalware-darcs] xorg-mess: libxt-1.0.4-1-x86_64 Message-ID: <20061205090422.9BCACFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205090507-d209c-80b445a38f7ad74f35df17fca5b913eeb2d305fd.gz; [libxt-1.0.4-1-x86_64 Christian Hamar alias krix **20061205090507 * Fixed depends() ] { hunk ./source/x11/libxt/FrugalBuild 12 -depends=('libx11>=1.0.99.2' 'libsm>=1.0.2' 'xproto') +depends=('libx11>=1.1.1' 'libsm>=1.0.2' 'xproto') } From krics at linuxforum.hu Tue Dec 5 10:10:06 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 10:10:09 2006 Subject: [Frugalware-darcs] xorg-mess: libxmu-1.0.3-1-x86_64 Message-ID: <20061205091006.E6886FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205091057-d209c-f3e96393bde798aedcd1c4e55ed06e80e9ea9058.gz; [libxmu-1.0.3-1-x86_64 Christian Hamar alias krix **20061205091057 * Fix depends ] { hunk ./source/x11/libxmu/FrugalBuild 12 -depends=('libx11>=1.0.99.2' 'libxt>=1.0.4' 'libxext') +depends=('libx11>=1.1.1' 'libxt>=1.0.4' 'libxext') } From krics at linuxforum.hu Tue Dec 5 10:37:00 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 10:37:03 2006 Subject: [Frugalware-darcs] xorg-mess: mesa-6.5.2-1-x86_64 Message-ID: <20061205093701.11A0CFA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205093734-d209c-6f734adbcb61340c7262bbac9c0242fcf995b49d.gz; [mesa-6.5.2-1-x86_64 Christian Hamar alias krix **20061205093734 * Version bump (yes, yes, it was pkgrel -- but mesa released officially) * Updated patch for new mesa ] { hunk ./source/x11/mesa/FrugalBuild 8 -pkgrel=2 +pkgrel=1 hunk ./source/x11/mesa/FrugalBuild 12 -depends=('expat' 'libx11>=1.0.99.2' 'libxext' 'libxxf86vm' 'libxi' 'libxmu>=1.0.3' 'libice' 'libdrm>=2.3.0' 'libgl') +depends=('expat' 'libx11>=1.1.1' 'libxext' 'libxxf86vm' 'libxi' 'libxmu>=1.0.3' 'libice' 'libdrm>=2.3.0' 'libgl') hunk ./source/x11/mesa/FrugalBuild 17 -#source=(http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$pkgver.tar.bz2 \ -source=(http://ftp.frugalware.org/pub/other/sources/mesa-cvs/$origname-$pkgver.tar.bz2 \ +source=(http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$pkgver.tar.bz2 \ hunk ./source/x11/mesa/FrugalBuild 21 -sha1sums=('70b689542e0522e233b60bcaa6201b856709e59b' \ +sha1sums=('ba860bb6ee57c02202342dfd5927464a068ea18f' \ hunk ./source/x11/mesa/FrugalBuild 25 - 'aa4926e039e394bd784fa92ecb86f58344a49110') + 'b49bb4f22426fd0dab7551ef8907276214c9a3fa') hunk ./source/x11/mesa/mesa-build-config.patch 61 --DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300 -+DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 +-DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 ++DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 } From krics at linuxforum.hu Tue Dec 5 10:41:49 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 10:41:52 2006 Subject: [Frugalware-darcs] xorg-mess: mesademos-6.5.2-1-x86_64 Message-ID: <20061205094150.08379FA4705@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205094229-d209c-9c478d75b2af5103bbeaa76e44a984f5df52588c.gz; [mesademos-6.5.2-1-x86_64 Christian Hamar alias krix **20061205094229 * Fxed depends * Version bump (fake) ] { hunk ./source/x11/mesademos/FrugalBuild 10 -depends=('mesa>=6.5.2' 'libstdc++' 'freeglut' 'libx11' 'libxmu' 'libxi' 'libdrm' 'libxvmc' 'libxxf86vm') +depends=('mesa>=6.5.2-1' 'libstdc++' 'freeglut' 'libx11>=1.1.1' 'libxmu' 'libxi' 'libdrm>=2.3.0' 'libxvmc' 'libxxf86vm') hunk ./source/x11/mesademos/FrugalBuild 14 -#source=(http://heanet.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-$pkgver.tar.bz2 \ -source=(http://ftp.frugalware.org/pub/other/sources/mesa-cvs/Mesa-$pkgver.tar.bz2 \ +source=(http://heanet.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-$pkgver.tar.bz2 \ hunk ./source/x11/mesademos/FrugalBuild 16 -sha1sums=('70b689542e0522e233b60bcaa6201b856709e59b' \ +sha1sums=('beac8b2fa9c6e25efd44b911d2d7952b2f87534c' \ } From krics at linuxforum.hu Tue Dec 5 11:31:03 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 11:31:27 2006 Subject: [Frugalware-darcs] xorg-mess: xorg-server-1.1.99.903-1-x86_64 Message-ID: <20061205103106.034ACFA4706@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205103050-d209c-b06bf85a36985cc0c78c9e60e3fbd38c5213396b.gz; [xorg-server-1.1.99.903-1-x86_64 Christian Hamar alias krix **20061205103050 * Version bump ] { hunk ./source/x11/xorg-server/FrugalBuild 5 -pkgver=1.2.99.0 -pkgrel=2 +pkgver=1.1.99.903 +pkgrel=1 hunk ./source/x11/xorg-server/FrugalBuild 12 -depends=('libxfont>=1.2.3' 'libx11>=1.0.99.1' 'xtrans>=1.0.2' 'libxau' \ +depends=('libxfont>=1.2.5' 'libx11>=1.1.1' 'xtrans>=1.0.2' 'libxau' \ hunk ./source/x11/xorg-server/FrugalBuild 14 - 'libxi>=1.1.0' 'freetype2' 'mesa>=6.5.2-2' 'font-cursor-misc' 'font-misc-misc' \ - 'xbitmaps' 'xkbdata' 'iceauth' 'rgb' 'xauth' 'xinit>=1.0.3' 'libxaw' \ + 'libxi=1.0.2' 'freetype2' 'mesa>=6.5.2-1' 'font-cursor-misc' 'font-misc-misc' \ + 'xbitmaps' 'xkeyboard-config' 'iceauth' 'rgb' 'xauth' 'xinit>=1.0.3' 'libxaw' \ hunk ./source/x11/xorg-server/FrugalBuild 17 - 'xorg-cf-files' 'libxtst' 'font-alias' 'libxcb') + 'xorg-cf-files' 'libxtst' 'font-alias' 'libxcb>=1.0') hunk ./source/x11/xorg-server/FrugalBuild 21 - 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto' 'inputproto>=1.4' 'bigreqsproto' 'xcmiscproto' \ + 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto' 'inputproto' 'bigreqsproto' 'xcmiscproto' \ hunk ./source/x11/xorg-server/FrugalBuild 28 -source=(${source[@]} http://ftp.frugalware.org/pub/other/sources/mesa-cvs/Mesa-$mesaver.tar.bz2 \ +source=(${source[@]} http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesaver.tar.bz2 \ hunk ./source/x11/xorg-server/FrugalBuild 39 - xorg-debug-fixes.patch \ - use-system-drm-fromgit.patch \ - libdrm-remants-remove-fromgit.patch \ - mesa-debug-glapi-fixes.patch \ - xkbcopykeymap-fix.patch) -sha1sums=('06bee10153da39f0f3cc89ca92bca766e996ebdf' \ - '70b689542e0522e233b60bcaa6201b856709e59b' \ + bug-8991-fix.patch \ + xorg-mesa.patch) +sha1sums=('e63ebbd368ca0f962de2f1e6a7720473e12f2d9b' \ + 'ba860bb6ee57c02202342dfd5927464a068ea18f' \ hunk ./source/x11/xorg-server/FrugalBuild 49 - 'aa4926e039e394bd784fa92ecb86f58344a49110' \ + 'b49bb4f22426fd0dab7551ef8907276214c9a3fa' \ hunk ./source/x11/xorg-server/FrugalBuild 53 - '818159b22480abc2555cb93b26fede8e43965e8c' \ - '546a6520e42f981b19d12c67efe124818a58c156' \ - '2360de51b840b2231a4b72be0c935e473e224f04' \ - 'ef13516615ca30694fb6c41c1284ea852eb33f45' \ - 'da4206c1be86635b8538847fb395b61f1eccd81c') + '60ccfea12bddf6cf0a7f56000472781442b10701' \ + '43addaea42f9308193770c12371960db24ab7db6') hunk ./source/x11/xorg-server/FrugalBuild 80 - # Fix for debug build :S (anyone tried to build xorg with --enable-debug ?? :S ) - Fpatch xorg-debug-fixes.patch + # https://bugs.freedesktop.org/show_bug.cgi?id=8991 + Fpatch bug-8991-fix.patch hunk ./source/x11/xorg-server/FrugalBuild 83 - # From got. use system libdrm instead of xorg included one (that one removed fully) - Fpatch use-system-drm-fromgit.patch - Fpatch libdrm-remants-remove-fromgit.patch - - # Fix for segfaults when pressing any of keys :S :) from git, thanks for Daniel - Fpatch xkbcopykeymap-fix.patch + Fpatch xorg-mesa.patch addfile ./source/x11/xorg-server/bug-8991-fix.patch hunk ./source/x11/xorg-server/bug-8991-fix.patch 1 +--- xorg-server-9999/GL/glx/indirect_table.c.orig 2006-10-12 16:02:06.000000000 +0800 ++++ xorg-server-9999/GL/glx/indirect_table.c 2006-10-12 16:15:35.000000000 +0800 +@@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di + + /*****************************************************************/ + /* tree depth = 13 */ +-static const int_fast16_t VendorPriv_dispatch_tree[155] = { ++static const int_fast16_t VendorPriv_dispatch_tree[159] = { + /* [0] -> opcode range [0, 131072], node depth 1 */ + 2, + 5, +@@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis + /* [152] -> opcode range [65536, 65552], node depth 13 */ + 1, + LEAF(88), ++ 156, + EMPTY_LEAF, + ++ /* [156] -> opcode range [65544, 65552], node depth 13 */ ++ 1, ++ LEAF(96), ++ EMPTY_LEAF, + }; + +-static const void *VendorPriv_function_table[96][2] = { ++static const void *VendorPriv_function_table[99][2] = { + /* [ 0] = 0 */ {NULL, NULL}, + /* [ 1] = 1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT}, + /* [ 2] = 2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT}, +@@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t + /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX}, + /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX}, + /* [ 95] = 65543 */ {NULL, NULL}, ++ /* [ 96] = 65544 */ {NULL, NULL}, ++ /* [ 97] = 65545 */ {NULL, NULL}, ++ /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX}, + }; + + const struct __glXDispatchInfo VendorPriv_dispatch_info = { hunk ./source/x11/xorg-server/mesa-build-config.patch 61 --DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300 -+DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 +-DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 ++DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 hunk ./source/x11/xorg-server/use-system-drm-fromgit.patch 1 -diff -Naur xorg-server-1.2.99.0.orig/configure.ac xorg-server-1.2.99.0/configure.ac ---- xorg-server-1.2.99.0.orig/configure.ac 2006-11-14 10:53:31.000000000 +0100 -+++ xorg-server-1.2.99.0/configure.ac 2006-11-14 11:02:55.000000000 +0100 -@@ -634,10 +634,11 @@ - if test "x$DRI" = xyes; then - AC_DEFINE(XF86DRI, 1, [Build DRI extension]) - PKG_CHECK_MODULES([DRIPROTO], [xf86driproto]) -- PKG_CHECK_MODULES([LIBDRM], [libdrm]) -+ PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.0]) - PKG_CHECK_MODULES([GL], [glproto >= 1.4.1]) - AC_SUBST(DRIPROTO_CFLAGS) - AC_SUBST(LIBDRM_CFLAGS) -+ AC_SUBST(LIBDRM_LIBS) - AC_SUBST(GL_CFLAGS) - fi - -@@ -1814,7 +1815,6 @@ - hw/xfree86/os-support/Makefile - hw/xfree86/os-support/bsd/Makefile - hw/xfree86/os-support/bus/Makefile --hw/xfree86/os-support/drm/Makefile - hw/xfree86/os-support/hurd/Makefile - hw/xfree86/os-support/misc/Makefile - hw/xfree86/os-support/linux/Makefile -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/common/xf86Config.c xorg-server-1.2.99.0/hw/xfree86/common/xf86Config.c ---- xorg-server-1.2.99.0.orig/hw/xfree86/common/xf86Config.c 2006-11-14 10:53:27.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/common/xf86Config.c 2006-11-14 11:02:55.000000000 +0100 -@@ -251,7 +251,7 @@ - { - int count = 0, i = 0; - char **modulearray; -- char *ignore[] = { "GLcore", "speedo", "bitmap", NULL }; -+ char *ignore[] = { "GLcore", "speedo", "bitmap", "drm", NULL }; - pointer *optarray; - XF86LoadPtr modp; - -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/dri/dri.c xorg-server-1.2.99.0/hw/xfree86/dri/dri.c ---- xorg-server-1.2.99.0.orig/hw/xfree86/dri/dri.c 2006-11-14 10:53:29.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/dri/dri.c 2006-11-14 11:02:55.000000000 +0100 -@@ -42,11 +42,13 @@ - #include - #include - #include -+#include - - #define NEED_REPLIES - #define NEED_EVENTS - #include - #include -+#include "xf86drm.h" - #include "misc.h" - #include "dixstruct.h" - #include "extnsionst.h" -@@ -67,6 +69,7 @@ - #include "glxserver.h" - #include "mi.h" - #include "mipointer.h" -+#include "xf86_OSproc.h" - - #if !defined(PANORAMIX) - extern Bool noPanoramiXExtension; -@@ -104,6 +107,7 @@ - va_end(ap); - } - -+ - Bool - DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) - { -@@ -571,6 +575,26 @@ - } - } - -+#define DRM_MSG_VERBOSITY 3 -+ -+static int dri_drm_debug_print(const char *format, va_list ap) -+{ -+ xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap); -+ return 0; -+} -+ -+static void dri_drm_get_perms(gid_t *group, mode_t *mode) -+{ -+ *group = xf86ConfigDRI.group; -+ *mode = xf86ConfigDRI.mode; -+} -+ -+static drmServerInfo DRIDRMServerInfo = { -+ dri_drm_debug_print, -+ xf86LoadKernelModule, -+ dri_drm_get_perms, -+}; -+ - Bool - DRIExtensionInit(void) - { -@@ -598,6 +622,8 @@ - return FALSE; - } - -+ drmSetServerInfo(&DRIDRMServerInfo); -+ - RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL); - - return TRUE; -@@ -2093,3 +2119,71 @@ - PciInfo->device, PciInfo->func); - return busID; - } -+ -+static void drmSIGIOHandler(int interrupt, void *closure) -+{ -+ unsigned long key; -+ void *value; -+ ssize_t count; -+ drm_ctx_t ctx; -+ typedef void (*_drmCallback)(int, void *, void *); -+ char buf[256]; -+ drm_context_t old; -+ drm_context_t new; -+ void *oldctx; -+ void *newctx; -+ char *pt; -+ drmHashEntry *entry; -+ void *hash_table; -+ -+ hash_table = drmGetHashTable(); -+ -+ if (!hash_table) return; -+ if (drmHashFirst(hash_table, &key, &value)) { -+ entry = value; -+ do { -+#if 0 -+ fprintf(stderr, "Trying %d\n", entry->fd); -+#endif -+ if ((count = read(entry->fd, buf, sizeof(buf))) > 0) { -+ buf[count] = '\0'; -+#if 0 -+ fprintf(stderr, "Got %s\n", buf); -+#endif -+ -+ for (pt = buf; *pt != ' '; ++pt); /* Find first space */ -+ ++pt; -+ old = strtol(pt, &pt, 0); -+ new = strtol(pt, NULL, 0); -+ oldctx = drmGetContextTag(entry->fd, old); -+ newctx = drmGetContextTag(entry->fd, new); -+#if 0 -+ fprintf(stderr, "%d %d %p %p\n", old, new, oldctx, newctx); -+#endif -+ ((_drmCallback)entry->f)(entry->fd, oldctx, newctx); -+ ctx.handle = new; -+ ioctl(entry->fd, DRM_IOCTL_NEW_CTX, &ctx); -+ } -+ } while (drmHashNext(hash_table, &key, &value)); -+ } -+} -+ -+ -+int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)) -+{ -+ drmHashEntry *entry; -+ -+ entry = drmGetEntry(fd); -+ entry->f = f; -+ -+ return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0); -+} -+ -+int drmRemoveSIGIOHandler(int fd) -+{ -+ drmHashEntry *entry = drmGetEntry(fd); -+ -+ entry->f = NULL; -+ -+ return xf86RemoveSIGIOHandler(fd); -+} -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/dri/dri.h xorg-server-1.2.99.0/hw/xfree86/dri/dri.h ---- xorg-server-1.2.99.0.orig/hw/xfree86/dri/dri.h 2006-11-14 10:53:29.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/dri/dri.h 2006-11-14 11:02:55.000000000 +0100 -@@ -339,6 +339,8 @@ - - extern char *DRICreatePCIBusID(pciVideoPtr PciInfo); - -+extern int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)); -+extern int drmRemoveSIGIOHandler(int fd); - #define _DRI_H_ - - #endif -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/dri/drimodule.c xorg-server-1.2.99.0/hw/xfree86/dri/drimodule.c ---- xorg-server-1.2.99.0.orig/hw/xfree86/dri/drimodule.c 2006-11-14 10:53:29.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/dri/drimodule.c 2006-11-14 11:02:55.000000000 +0100 -@@ -74,23 +74,14 @@ - driSetup(pointer module, pointer opts, int *errmaj, int *errmin) - { - static Bool setupDone = FALSE; -- pointer drm = NULL; - - if (!setupDone) { - setupDone = TRUE; -- -- drm = -- LoadSubModule(module, "drm", NULL, NULL, NULL, NULL, errmaj, errmin); -- -- if (!drm) { -- if (errmaj) *errmaj = LDR_NOSUBENT; -- } else { -- LoadExtension(&XF86DRIExt, FALSE); -- } -+ LoadExtension(&XF86DRIExt, FALSE); - } else { - if (errmaj) *errmaj = LDR_ONCEONLY; - } - /* Need a non-NULL return value to indicate success */ -- return drm; -+ return 1; - } - -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/dri/Makefile.am xorg-server-1.2.99.0/hw/xfree86/dri/Makefile.am ---- xorg-server-1.2.99.0.orig/hw/xfree86/dri/Makefile.am 2006-11-14 10:53:29.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/dri/Makefile.am 2006-11-14 11:02:55.000000000 +0100 -@@ -7,13 +7,10 @@ - -I$(top_builddir)/GL/include \ - -I@MESA_SOURCE@/include \ - -DHAVE_XORG_CONFIG_H \ -- \ -- \ -- \ - @DRIPROTO_CFLAGS@ \ - @LIBDRM_CFLAGS@ \ - @GL_CFLAGS@ --libdri_la_LDFLAGS = -module -avoid-version -+libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@ - libdri_ladir = $(moduledir)/extensions - libdri_la_SOURCES = \ - dri.c \ -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/drmmodule.c xorg-server-1.2.99.0/hw/xfree86/os-support/drm/drmmodule.c ---- xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/drmmodule.c 2006-11-14 10:53:27.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/os-support/drm/drmmodule.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,57 +0,0 @@ --/* drmmodule.c -- Module initialization -- * Created: Fri Jun 4 09:05:48 1999 by faith@precisioninsight.com -- * -- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. -- * All Rights Reserved. -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice (including the next -- * paragraph) shall be included in all copies or substantial portions of the -- * Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -- * DEALINGS IN THE SOFTWARE. -- * -- * Authors: Rickard E. (Rik) Faith -- */ -- --#ifdef HAVE_XORG_CONFIG_H --#include --#endif -- --#include "xf86Module.h" -- --static MODULESETUPPROTO(drmSetup); -- --static XF86ModuleVersionInfo VersRec = --{ -- "drm", -- MODULEVENDORSTRING, -- MODINFOSTRING1, -- MODINFOSTRING2, -- XORG_VERSION_CURRENT, -- 1, 0, 0, -- ABI_CLASS_EXTENSION, -- ABI_EXTENSION_VERSION, -- MOD_CLASS_NONE, -- {0,0,0,0} --}; -- --_X_EXPORT XF86ModuleData drmModuleData = { &VersRec, drmSetup, NULL }; -- --static pointer --drmSetup(pointer module, pointer opts, int *errmaj, int *errmin) --{ -- return (void *)1; --} -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/Makefile.am xorg-server-1.2.99.0/hw/xfree86/os-support/drm/Makefile.am ---- xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/Makefile.am 2006-11-14 10:53:27.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/os-support/drm/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -@@ -1,19 +0,0 @@ --libdrm_la_LTLIBRARIES = libdrm.la --libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -- -I$(top_srcdir)/hw/xfree86/dri \ -- -I$(top_srcdir)/hw/xfree86/os-support \ -- -I$(top_srcdir)/hw/xfree86/os-support/bus \ -- -I$(top_srcdir)/hw/xfree86/os-suport/shared/drm/kernel \ -- -I$(top_srcdir)/GL/glx \ -- -I$(top_srcdir)/GL/include \ -- -DHAVE_XORG_CONFIG_H \ -- @LIBDRM_CFLAGS@ -- --libdrm_la_LDFLAGS = -module -avoid-version --libdrm_ladir = $(moduledir)/@XORG_OS@ --libdrm_la_SOURCES = \ -- xf86drm.c \ -- xf86drmHash.c \ -- xf86drmRandom.c \ -- xf86drmSL.c \ -- drmmodule.c -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/xf86drm.c xorg-server-1.2.99.0/hw/xfree86/os-support/drm/xf86drm.c ---- xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/xf86drm.c 2006-11-14 10:53:27.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/os-support/drm/xf86drm.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,3262 +0,0 @@ --/** -- * \file xf86drm.c -- * User-level interface to DRM device -- * -- * \author Rickard E. (Rik) Faith -- * \author Kevin E. Martin -- */ -- --/* -- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. -- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. -- * All Rights Reserved. -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice (including the next -- * paragraph) shall be included in all copies or substantial portions of the -- * Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -- * DEALINGS IN THE SOFTWARE. -- */ -- -- --#ifdef HAVE_XORG_CONFIG_H --#include --#include --#endif -- --#include "xf86.h" --#include "xf86_OSproc.h" --#define _DRM_MALLOC xalloc --#define _DRM_FREE xfree -- --#include "drm.h" --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#define stat_t struct stat --#include --#include --#include --#include -- --/* No longer needed with CVS kernel modules on alpha --#if defined(__alpha__) && defined(__linux__) --extern unsigned long _bus_base(void); --#define BUS_BASE _bus_base() --#endif --*/ -- --/* Not all systems have MAP_FAILED defined */ --#ifndef MAP_FAILED --#define MAP_FAILED ((void *)-1) --#endif -- --#include "xf86drm.h" -- --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) --#define DRM_MAJOR 145 --#endif -- --#ifdef __NetBSD__ --#define DRM_MAJOR 34 --#endif -- --# ifdef __OpenBSD__ --# define DRM_MAJOR 81 --# endif -- --#ifndef DRM_MAJOR --#define DRM_MAJOR 226 /* Linux */ --#endif -- --#ifndef DRM_MAX_MINOR --#define DRM_MAX_MINOR 16 --#endif -- --#ifndef makedev -- /* This definition needs to be changed on -- some systems if dev_t is a structure. -- If there is a header file we can get it -- from, there would be best. */ --#define makedev(x,y) ((dev_t)(((x) << 8) | (y))) --#endif -- --#define DRM_MSG_VERBOSITY 3 -- --/** -- * Output a message to stderr. -- * -- * \param format printf() like format string. -- * -- * \internal -- * This function is a wrapper around vfprintf(). -- */ --static void --drmMsg(const char *format, ...) --{ -- va_list ap; -- -- va_start(ap, format); -- xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap); -- va_end(ap); --} -- --static void *drmHashTable = NULL; /* Context switch callbacks */ -- --typedef struct drmHashEntry { -- int fd; -- void (*f)(int, void *, void *); -- void *tagTable; --} drmHashEntry; -- --void *drmMalloc(int size) --{ -- void *pt; -- if ((pt = _DRM_MALLOC(size))) memset(pt, 0, size); -- return pt; --} -- --void drmFree(void *pt) --{ -- if (pt) _DRM_FREE(pt); --} -- --/* drmStrdup can't use strdup(3), since it doesn't call _DRM_MALLOC... */ --static char *drmStrdup(const char *s) --{ -- char *retval = NULL; -- -- if (s) { -- retval = _DRM_MALLOC(strlen(s)+1); -- strcpy(retval, s); -- } -- return retval; --} -- -- --static unsigned long drmGetKeyFromFd(int fd) --{ -- stat_t st; -- -- st.st_rdev = 0; -- fstat(fd, &st); -- return st.st_rdev; --} -- --static drmHashEntry *drmGetEntry(int fd) --{ -- unsigned long key = drmGetKeyFromFd(fd); -- void *value; -- drmHashEntry *entry; -- -- if (!drmHashTable) drmHashTable = drmHashCreate(); -- -- if (drmHashLookup(drmHashTable, key, &value)) { -- entry = drmMalloc(sizeof(*entry)); -- entry->fd = fd; -- entry->f = NULL; -- entry->tagTable = drmHashCreate(); -- drmHashInsert(drmHashTable, key, entry); -- } else { -- entry = value; -- } -- return entry; --} -- --/** -- * Compare two busid strings -- * -- * \param first -- * \param second -- * -- * \return 1 if matched. -- * -- * \internal -- * This function compares two bus ID strings. It understands the older -- * PCI:b:d:f format and the newer pci:oooo:bb:dd.f format. In the format, o is -- * domain, b is bus, d is device, f is function. -- */ --static int drmMatchBusID(const char *id1, const char *id2) --{ -- /* First, check if the IDs are exactly the same */ -- if (strcasecmp(id1, id2) == 0) -- return 1; -- -- /* Try to match old/new-style PCI bus IDs. */ -- if (strncasecmp(id1, "pci", 3) == 0) { -- int o1, b1, d1, f1; -- int o2, b2, d2, f2; -- int ret; -- -- ret = sscanf(id1, "pci:%04x:%02x:%02x.%d", &o1, &b1, &d1, &f1); -- if (ret != 4) { -- o1 = 0; -- ret = sscanf(id1, "PCI:%d:%d:%d", &b1, &d1, &f1); -- if (ret != 3) -- return 0; -- } -- -- ret = sscanf(id2, "pci:%04x:%02x:%02x.%d", &o2, &b2, &d2, &f2); -- if (ret != 4) { -- o2 = 0; -- ret = sscanf(id2, "PCI:%d:%d:%d", &b2, &d2, &f2); -- if (ret != 3) -- return 0; -- } -- -- if ((o1 != o2) || (b1 != b2) || (d1 != d2) || (f1 != f2)) -- return 0; -- else -- return 1; -- } -- return 0; --} -- --/** -- * Open the DRM device, creating it if necessary. -- * -- * \param dev major and minor numbers of the device. -- * \param minor minor number of the device. -- * -- * \return a file descriptor on success, or a negative value on error. -- * -- * \internal -- * Assembles the device name from \p minor and opens it, creating the device -- * special file node with the major and minor numbers specified by \p dev and -- * parent directory if necessary and was called by root. -- */ --static int drmOpenDevice(long dev, int minor) --{ -- stat_t st; -- char buf[64]; -- int fd; -- mode_t devmode = DRM_DEV_MODE; -- int isroot = !geteuid(); -- uid_t user = DRM_DEV_UID; -- gid_t group = DRM_DEV_GID; -- -- sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor); -- drmMsg("drmOpenDevice: node name is %s\n", buf); -- -- devmode = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE; -- devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH); -- group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID; -- -- if (stat(DRM_DIR_NAME, &st)) { -- if (!isroot) return DRM_ERR_NOT_ROOT; -- mkdir(DRM_DIR_NAME, DRM_DEV_DIRMODE); -- chown(DRM_DIR_NAME, 0, 0); /* root:root */ -- chmod(DRM_DIR_NAME, DRM_DEV_DIRMODE); -- } -- -- /* Check if the device node exists and create it if necessary. */ -- if (stat(buf, &st)) { -- if (!isroot) return DRM_ERR_NOT_ROOT; -- remove(buf); -- mknod(buf, S_IFCHR | devmode, dev); -- } -- chown(buf, user, group); -- chmod(buf, devmode); -- -- fd = open(buf, O_RDWR, 0); -- drmMsg("drmOpenDevice: open result is %d, (%s)\n", -- fd, fd < 0 ? strerror(errno) : "OK"); -- if (fd >= 0) return fd; -- -- /* Check if the device node is not what we expect it to be, and recreate it -- * and try again if so. -- */ -- if (st.st_rdev != dev) { -- if (!isroot) return DRM_ERR_NOT_ROOT; -- remove(buf); -- mknod(buf, S_IFCHR | devmode, dev); -- chown(buf, user, group); -- chmod(buf, devmode); -- } -- fd = open(buf, O_RDWR, 0); -- drmMsg("drmOpenDevice: open result is %d, (%s)\n", -- fd, fd < 0 ? strerror(errno) : "OK"); -- if (fd >= 0) return fd; -- -- drmMsg("drmOpenDevice: Open failed\n"); -- remove(buf); -- return -errno; --} -- -- --/** -- * Open the DRM device -- * -- * \param minor device minor number. -- * \param create allow to create the device if set. -- * -- * \return a file descriptor on success, or a negative value on error. -- * -- * \internal -- * Calls drmOpenDevice() if \p create is set, otherwise assembles the device -- * name from \p minor and opens it. -- */ --static int drmOpenMinor(int minor, int create) --{ -- int fd; -- char buf[64]; -- -- if (create) return drmOpenDevice(makedev(DRM_MAJOR, minor), minor); -- -- sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor); -- if ((fd = open(buf, O_RDWR, 0)) >= 0) return fd; -- return -errno; --} -- -- --/** -- * Determine whether the DRM kernel driver has been loaded. -- * -- * \return 1 if the DRM driver is loaded, 0 otherwise. -- * -- * \internal -- * Determine the presence of the kernel driver by attempting to open the 0 -- * minor and get version information. For backward compatibility with older -- * Linux implementations, /proc/dri is also checked. -- */ --int drmAvailable(void) --{ -- drmVersionPtr version; -- int retval = 0; -- int fd; -- -- if ((fd = drmOpenMinor(0, 1)) < 0) { --#ifdef __linux__ -- /* Try proc for backward Linux compatibility */ -- if (!access("/proc/dri/0", R_OK)) return 1; --#endif -- return 0; -- } -- -- if ((version = drmGetVersion(fd))) { -- retval = 1; -- drmFreeVersion(version); -- } -- close(fd); -- -- return retval; --} -- -- --/** -- * Open the device by bus ID. -- * -- * \param busid bus ID. -- * -- * \return a file descriptor on success, or a negative value on error. -- * -- * \internal -- * This function attempts to open every possible minor (up to DRM_MAX_MINOR), -- * comparing the device bus ID with the one supplied. -- * -- * \sa drmOpenMinor() and drmGetBusid(). -- */ --static int drmOpenByBusid(const char *busid) --{ -- int i; -- int fd; -- const char *buf; -- drmSetVersion sv; -- -- drmMsg("drmOpenByBusid: Searching for BusID %s\n", busid); -- for (i = 0; i < DRM_MAX_MINOR; i++) { -- fd = drmOpenMinor(i, 1); -- drmMsg("drmOpenByBusid: drmOpenMinor returns %d\n", fd); -- if (fd >= 0) { -- sv.drm_di_major = 1; -- sv.drm_di_minor = 1; -- sv.drm_dd_major = -1; /* Don't care */ -- drmSetInterfaceVersion(fd, &sv); -- buf = drmGetBusid(fd); -- drmMsg("drmOpenByBusid: drmGetBusid reports %s\n", buf); -- if (buf && drmMatchBusID(buf, busid)) { -- drmFreeBusid(buf); -- return fd; -- } -- if (buf) drmFreeBusid(buf); -- close(fd); -- } -- } -- return -1; --} -- -- --/** -- * Open the device by name. -- * -- * \param name driver name. -- * -- * \return a file descriptor on success, or a negative value on error. -- * -- * \internal -- * This function opens the first minor number that matches the driver name and -- * isn't already in use. If it's in use it then it will already have a bus ID -- * assigned. -- * -- * \sa drmOpenMinor(), drmGetVersion() and drmGetBusid(). -- */ --static int drmOpenByName(const char *name) --{ -- int i; -- int fd; -- drmVersionPtr version; -- char * id; -- -- if (!drmAvailable()) { -- /* try to load the kernel module now */ -- if (!xf86LoadKernelModule(name)) { -- ErrorF("[drm] failed to load kernel module \"%s\"\n", -- name); -- return -1; -- } -- } -- -- /* -- * Open the first minor number that matches the driver name and isn't -- * already in use. If it's in use it will have a busid assigned already. -- */ -- for (i = 0; i < DRM_MAX_MINOR; i++) { -- if ((fd = drmOpenMinor(i, 1)) >= 0) { -- if ((version = drmGetVersion(fd))) { -- if (!strcmp(version->name, name)) { -- drmFreeVersion(version); -- id = drmGetBusid(fd); -- drmMsg("drmGetBusid returned '%s'\n", id ? id : "NULL"); -- if (!id || !*id) { -- if (id) { -- drmFreeBusid(id); -- } -- return fd; -- } else { -- drmFreeBusid(id); -- } -- } else { -- drmFreeVersion(version); -- } -- } -- close(fd); -- } -- } -- --#ifdef __linux__ -- /* Backward-compatibility /proc support */ -- for (i = 0; i < 8; i++) { -- char proc_name[64], buf[512]; -- char *driver, *pt, *devstring; -- int retcode; -- -- sprintf(proc_name, "/proc/dri/%d/name", i); -- if ((fd = open(proc_name, 0, 0)) >= 0) { -- retcode = read(fd, buf, sizeof(buf)-1); -- close(fd); -- if (retcode) { -- buf[retcode-1] = '\0'; -- for (driver = pt = buf; *pt && *pt != ' '; ++pt) -- ; -- if (*pt) { /* Device is next */ -- *pt = '\0'; -- if (!strcmp(driver, name)) { /* Match */ -- for (devstring = ++pt; *pt && *pt != ' '; ++pt) -- ; -- if (*pt) { /* Found busid */ -- return drmOpenByBusid(++pt); -- } else { /* No busid */ -- return drmOpenDevice(strtol(devstring, NULL, 0),i); -- } -- } -- } -- } -- } -- } --#endif -- -- return -1; --} -- -- --/** -- * Open the DRM device. -- * -- * Looks up the specified name and bus ID, and opens the device found. The -- * entry in /dev/dri is created if necessary and if called by root. -- * -- * \param name driver name. Not referenced if bus ID is supplied. -- * \param busid bus ID. Zero if not known. -- * -- * \return a file descriptor on success, or a negative value on error. -- * -- * \internal -- * It calls drmOpenByBusid() if \p busid is specified or drmOpenByName() -- * otherwise. -- */ --int drmOpen(const char *name, const char *busid) --{ -- if (!drmAvailable() && name != NULL) { -- /* try to load the kernel */ -- if (!xf86LoadKernelModule(name)) { -- ErrorF("[drm] failed to load kernel module \"%s\"\n", -- name); -- return -1; -- } -- } -- -- if (busid) { -- int fd; -- -- fd = drmOpenByBusid(busid); -- if (fd >= 0) -- return fd; -- } -- if (name) -- return drmOpenByName(name); -- return -1; --} -- -- --/** -- * Free the version information returned by drmGetVersion(). -- * -- * \param v pointer to the version information. -- * -- * \internal -- * It frees the memory pointed by \p %v as well as all the non-null strings -- * pointers in it. -- */ --void drmFreeVersion(drmVersionPtr v) --{ -- if (!v) return; -- if (v->name) drmFree(v->name); -- if (v->date) drmFree(v->date); -- if (v->desc) drmFree(v->desc); -- drmFree(v); --} -- -- --/** -- * Free the non-public version information returned by the kernel. -- * -- * \param v pointer to the version information. -- * -- * \internal -- * Used by drmGetVersion() to free the memory pointed by \p %v as well as all -- * the non-null strings pointers in it. -- */ --static void drmFreeKernelVersion(drm_version_t *v) --{ -- if (!v) return; -- if (v->name) drmFree(v->name); -- if (v->date) drmFree(v->date); -- if (v->desc) drmFree(v->desc); -- drmFree(v); --} -- -- --/** -- * Copy version information. -- * -- * \param d destination pointer. -- * \param s source pointer. -- * -- * \internal -- * Used by drmGetVersion() to translate the information returned by the ioctl -- * interface in a private structure into the public structure counterpart. -- */ --static void drmCopyVersion(drmVersionPtr d, const drm_version_t *s) --{ -- d->version_major = s->version_major; -- d->version_minor = s->version_minor; -- d->version_patchlevel = s->version_patchlevel; -- d->name_len = s->name_len; -- d->name = drmStrdup(s->name); -- d->date_len = s->date_len; -- d->date = drmStrdup(s->date); -- d->desc_len = s->desc_len; -- d->desc = drmStrdup(s->desc); --} -- -- --/** -- * Query the driver version information. -- * -- * \param fd file descriptor. -- * -- * \return pointer to a drmVersion structure which should be freed with -- * drmFreeVersion(). -- * -- * \note Similar information is available via /proc/dri. -- * -- * \internal -- * It gets the version information via successive DRM_IOCTL_VERSION ioctls, -- * first with zeros to get the string lengths, and then the actually strings. -- * It also null-terminates them since they might not be already. -- */ --drmVersionPtr drmGetVersion(int fd) --{ -- drmVersionPtr retval; -- drm_version_t *version = drmMalloc(sizeof(*version)); -- -- /* First, get the lengths */ -- version->name_len = 0; -- version->name = NULL; -- version->date_len = 0; -- version->date = NULL; -- version->desc_len = 0; -- version->desc = NULL; -- -- if (ioctl(fd, DRM_IOCTL_VERSION, version)) { -- drmFreeKernelVersion(version); -- return NULL; -- } -- -- /* Now, allocate space and get the data */ -- if (version->name_len) -- version->name = drmMalloc(version->name_len + 1); -- if (version->date_len) -- version->date = drmMalloc(version->date_len + 1); -- if (version->desc_len) -- version->desc = drmMalloc(version->desc_len + 1); -- -- if (ioctl(fd, DRM_IOCTL_VERSION, version)) { -- drmMsg("DRM_IOCTL_VERSION: %s\n", strerror(errno)); -- drmFreeKernelVersion(version); -- return NULL; -- } -- -- /* The results might not be null-terminated -- strings, so terminate them. */ -- -- if (version->name_len) version->name[version->name_len] = '\0'; -- if (version->date_len) version->date[version->date_len] = '\0'; -- if (version->desc_len) version->desc[version->desc_len] = '\0'; -- -- /* Now, copy it all back into the -- client-visible data structure... */ -- retval = drmMalloc(sizeof(*retval)); -- drmCopyVersion(retval, version); -- drmFreeKernelVersion(version); -- return retval; --} -- -- --/** -- * Get version information for the DRM user space library. -- * -- * This version number is driver independent. -- * -- * \param fd file descriptor. -- * -- * \return version information. -- * -- * \internal -- * This function allocates and fills a drm_version structure with a hard coded -- * version number. -- */ --drmVersionPtr drmGetLibVersion(int fd) --{ -- drm_version_t *version = drmMalloc(sizeof(*version)); -- -- /* Version history: -- * revision 1.0.x = original DRM interface with no drmGetLibVersion -- * entry point and many drm extensions -- * revision 1.1.x = added drmCommand entry points for device extensions -- * added drmGetLibVersion to identify libdrm.a version -- * revision 1.2.x = added drmSetInterfaceVersion -- * modified drmOpen to handle both busid and name -- */ -- version->version_major = 1; -- version->version_minor = 2; -- version->version_patchlevel = 0; -- -- return (drmVersionPtr)version; --} -- -- --/** -- * Free the bus ID information. -- * -- * \param busid bus ID information string as given by drmGetBusid(). -- * -- * \internal -- * This function is just frees the memory pointed by \p busid. -- */ --void drmFreeBusid(const char *busid) --{ -- drmFree((void *)busid); --} -- -- --/** -- * Get the bus ID of the device. -- * -- * \param fd file descriptor. -- * -- * \return bus ID string. -- * -- * \internal -- * This function gets the bus ID via successive DRM_IOCTL_GET_UNIQUE ioctls to -- * get the string length and data, passing the arguments in a drm_unique -- * structure. -- */ --char *drmGetBusid(int fd) --{ -- drm_unique_t u; -- -- u.unique_len = 0; -- u.unique = NULL; -- -- if (ioctl(fd, DRM_IOCTL_GET_UNIQUE, &u)) return NULL; -- u.unique = drmMalloc(u.unique_len + 1); -- if (ioctl(fd, DRM_IOCTL_GET_UNIQUE, &u)) return NULL; -- u.unique[u.unique_len] = '\0'; -- -- return u.unique; --} -- -- --/** -- * Set the bus ID of the device. -- * -- * \param fd file descriptor. -- * \param busid bus ID string. -- * -- * \return zero on success, negative on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_SET_UNIQUE ioctl, passing -- * the arguments in a drm_unique structure. -- */ --int drmSetBusid(int fd, const char *busid) --{ -- drm_unique_t u; -- -- u.unique = (char *)busid; -- u.unique_len = strlen(busid); -- -- if (ioctl(fd, DRM_IOCTL_SET_UNIQUE, &u)) { -- return -errno; -- } -- return 0; --} -- --int drmGetMagic(int fd, drm_magic_t * magic) --{ -- drm_auth_t auth; -- -- *magic = 0; -- if (ioctl(fd, DRM_IOCTL_GET_MAGIC, &auth)) return -errno; -- *magic = auth.magic; -- return 0; --} -- --int drmAuthMagic(int fd, drm_magic_t magic) --{ -- drm_auth_t auth; -- -- auth.magic = magic; -- if (ioctl(fd, DRM_IOCTL_AUTH_MAGIC, &auth)) return -errno; -- return 0; --} -- --/** -- * Specifies a range of memory that is available for mapping by a -- * non-root process. -- * -- * \param fd file descriptor. -- * \param offset usually the physical address. The actual meaning depends of -- * the \p type parameter. See below. -- * \param size of the memory in bytes. -- * \param type type of the memory to be mapped. -- * \param flags combination of several flags to modify the function actions. -- * \param handle will be set to a value that may be used as the offset -- * parameter for mmap(). -- * -- * \return zero on success or a negative value on error. -- * -- * \par Mapping the frame buffer -- * For the frame buffer -- * - \p offset will be the physical address of the start of the frame buffer, -- * - \p size will be the size of the frame buffer in bytes, and -- * - \p type will be DRM_FRAME_BUFFER. -- * -- * \par -- * The area mapped will be uncached. If MTRR support is available in the -- * kernel, the frame buffer area will be set to write combining. -- * -- * \par Mapping the MMIO register area -- * For the MMIO register area, -- * - \p offset will be the physical address of the start of the register area, -- * - \p size will be the size of the register area bytes, and -- * - \p type will be DRM_REGISTERS. -- * \par -- * The area mapped will be uncached. -- * -- * \par Mapping the SAREA -- * For the SAREA, -- * - \p offset will be ignored and should be set to zero, -- * - \p size will be the desired size of the SAREA in bytes, -- * - \p type will be DRM_SHM. -- * -- * \par -- * A shared memory area of the requested size will be created and locked in -- * kernel memory. This area may be mapped into client-space by using the handle -- * returned. -- * -- * \note May only be called by root. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_ADD_MAP ioctl, passing -- * the arguments in a drm_map structure. -- */ --int drmAddMap(int fd, -- drm_handle_t offset, -- drmSize size, -- drmMapType type, -- drmMapFlags flags, -- drm_handle_t * handle) --{ -- drm_map_t map; -- -- map.offset = offset; --/* No longer needed with CVS kernel modules on alpha --#ifdef __alpha__ -- if (type != DRM_SHM) -- map.offset += BUS_BASE; --#endif --*/ -- map.size = size; -- map.handle = 0; -- map.type = type; -- map.flags = flags; -- if (ioctl(fd, DRM_IOCTL_ADD_MAP, &map)) return -errno; -- if (handle) *handle = (drm_handle_t)(unsigned long)map.handle; -- return 0; --} -- --int drmRmMap(int fd, drm_handle_t handle) --{ -- drm_map_t map; -- -- map.handle = (void *)(unsigned long)handle; -- -- if(ioctl(fd, DRM_IOCTL_RM_MAP, &map)) return -errno; -- return 0; --} -- --/** -- * Make buffers available for DMA transfers. -- * -- * \param fd file descriptor. -- * \param count number of buffers. -- * \param size size of each buffer. -- * \param flags buffer allocation flags. -- * \param agp_offset offset in the AGP aperture -- * -- * \return number of buffers allocated, negative on error. -- * -- * \internal -- * This function is a wrapper around DRM_IOCTL_ADD_BUFS ioctl. -- * -- * \sa drm_buf_desc. -- */ --int drmAddBufs(int fd, int count, int size, drmBufDescFlags flags, -- int agp_offset) --{ -- drm_buf_desc_t request; -- -- request.count = count; -- request.size = size; -- request.low_mark = 0; -- request.high_mark = 0; -- request.flags = flags; -- request.agp_start = agp_offset; -- -- if (ioctl(fd, DRM_IOCTL_ADD_BUFS, &request)) return -errno; -- return request.count; --} -- --int drmMarkBufs(int fd, double low, double high) --{ -- drm_buf_info_t info; -- int i; -- -- info.count = 0; -- info.list = NULL; -- -- if (ioctl(fd, DRM_IOCTL_INFO_BUFS, &info)) return -EINVAL; -- -- if (!info.count) return -EINVAL; -- -- if (!(info.list = drmMalloc(info.count * sizeof(*info.list)))) -- return -ENOMEM; -- -- if (ioctl(fd, DRM_IOCTL_INFO_BUFS, &info)) { -- int retval = -errno; -- drmFree(info.list); -- return retval; -- } -- -- for (i = 0; i < info.count; i++) { -- info.list[i].low_mark = low * info.list[i].count; -- info.list[i].high_mark = high * info.list[i].count; -- if (ioctl(fd, DRM_IOCTL_MARK_BUFS, &info.list[i])) { -- int retval = -errno; -- drmFree(info.list); -- return retval; -- } -- } -- drmFree(info.list); -- -- return 0; --} -- --/** -- * Free buffers. -- * -- * \param fd file descriptor. -- * \param count number of buffers to free. -- * \param list list of buffers to be freed. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \note This function is primarily used for debugging. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_FREE_BUFS ioctl, passing -- * the arguments in a drm_buf_free structure. -- */ --int drmFreeBufs(int fd, int count, int *list) --{ -- drm_buf_free_t request; -- -- request.count = count; -- request.list = list; -- if (ioctl(fd, DRM_IOCTL_FREE_BUFS, &request)) return -errno; -- return 0; --} -- -- --/** -- * Close the device. -- * -- * \param fd file descriptor. -- * -- * \internal -- * This function closes the file descriptor. -- */ --int drmClose(int fd) --{ -- unsigned long key = drmGetKeyFromFd(fd); -- drmHashEntry *entry = drmGetEntry(fd); -- -- drmHashDestroy(entry->tagTable); -- entry->fd = 0; -- entry->f = NULL; -- entry->tagTable = NULL; -- -- drmHashDelete(drmHashTable, key); -- drmFree(entry); -- -- return close(fd); --} -- -- --/** -- * Map a region of memory. -- * -- * \param fd file descriptor. -- * \param handle handle returned by drmAddMap(). -- * \param size size in bytes. Must match the size used by drmAddMap(). -- * \param address will contain the user-space virtual address where the mapping -- * begins. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper for mmap(). -- */ --int drmMap(int fd, -- drm_handle_t handle, -- drmSize size, -- drmAddressPtr address) --{ -- static unsigned long pagesize_mask = 0; -- -- if (fd < 0) return -EINVAL; -- -- if (!pagesize_mask) -- pagesize_mask = getpagesize() - 1; -- -- size = (size + pagesize_mask) & ~pagesize_mask; -- -- *address = mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, handle); -- if (*address == MAP_FAILED) return -errno; -- return 0; --} -- -- --/** -- * Unmap mappings obtained with drmMap(). -- * -- * \param address address as given by drmMap(). -- * \param size size in bytes. Must match the size used by drmMap(). -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper for unmap(). -- */ --int drmUnmap(drmAddress address, drmSize size) --{ -- return munmap(address, size); --} -- --drmBufInfoPtr drmGetBufInfo(int fd) --{ -- drm_buf_info_t info; -- drmBufInfoPtr retval; -- int i; -- -- info.count = 0; -- info.list = NULL; -- -- if (ioctl(fd, DRM_IOCTL_INFO_BUFS, &info)) return NULL; -- -- if (info.count) { -- if (!(info.list = drmMalloc(info.count * sizeof(*info.list)))) -- return NULL; -- -- if (ioctl(fd, DRM_IOCTL_INFO_BUFS, &info)) { -- drmFree(info.list); -- return NULL; -- } -- /* Now, copy it all back into the -- client-visible data structure... */ -- retval = drmMalloc(sizeof(*retval)); -- retval->count = info.count; -- retval->list = drmMalloc(info.count * sizeof(*retval->list)); -- for (i = 0; i < info.count; i++) { -- retval->list[i].count = info.list[i].count; -- retval->list[i].size = info.list[i].size; -- retval->list[i].low_mark = info.list[i].low_mark; -- retval->list[i].high_mark = info.list[i].high_mark; -- } -- drmFree(info.list); -- return retval; -- } -- return NULL; --} -- --/** -- * Map all DMA buffers into client-virtual space. -- * -- * \param fd file descriptor. -- * -- * \return a pointer to a ::drmBufMap structure. -- * -- * \note The client may not use these buffers until obtaining buffer indices -- * with drmDMA(). -- * -- * \internal -- * This function calls the DRM_IOCTL_MAP_BUFS ioctl and copies the returned -- * information about the buffers in a drm_buf_map structure into the -- * client-visible data structures. -- */ --drmBufMapPtr drmMapBufs(int fd) --{ -- drm_buf_map_t bufs; -- drmBufMapPtr retval; -- int i; -- -- bufs.count = 0; -- bufs.list = NULL; -- bufs.virtual = NULL; -- if (ioctl(fd, DRM_IOCTL_MAP_BUFS, &bufs)) return NULL; -- -- if (!bufs.count) return NULL; -- -- if (!(bufs.list = drmMalloc(bufs.count * sizeof(*bufs.list)))) -- return NULL; -- -- if (ioctl(fd, DRM_IOCTL_MAP_BUFS, &bufs)) { -- drmFree(bufs.list); -- return NULL; -- } -- /* Now, copy it all back into the -- client-visible data structure... */ -- retval = drmMalloc(sizeof(*retval)); -- retval->count = bufs.count; -- retval->list = drmMalloc(bufs.count * sizeof(*retval->list)); -- for (i = 0; i < bufs.count; i++) { -- retval->list[i].idx = bufs.list[i].idx; -- retval->list[i].total = bufs.list[i].total; -- retval->list[i].used = 0; -- retval->list[i].address = bufs.list[i].address; -- } -- -- drmFree(bufs.list); -- -- return retval; --} -- -- --/** -- * Unmap buffers allocated with drmMapBufs(). -- * -- * \return zero on success, or negative value on failure. -- * -- * \internal -- * Calls munmap() for every buffer stored in \p bufs and frees the -- * memory allocated by drmMapBufs(). -- */ --int drmUnmapBufs(drmBufMapPtr bufs) --{ -- int i; -- -- for (i = 0; i < bufs->count; i++) { -- munmap(bufs->list[i].address, bufs->list[i].total); -- } -- -- drmFree(bufs->list); -- drmFree(bufs); -- -- return 0; --} -- -- --#define DRM_DMA_RETRY 16 -- --/** -- * Reserve DMA buffers. -- * -- * \param fd file descriptor. -- * \param request -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * Assemble the arguments into a drm_dma structure and keeps issuing the -- * DRM_IOCTL_DMA ioctl until success or until maximum number of retries. -- */ --int drmDMA(int fd, drmDMAReqPtr request) --{ -- drm_dma_t dma; -- int ret, i = 0; -- -- /* Copy to hidden structure */ -- dma.context = request->context; -- dma.send_count = request->send_count; -- dma.send_indices = request->send_list; -- dma.send_sizes = request->send_sizes; -- dma.flags = request->flags; -- dma.request_count = request->request_count; -- dma.request_size = request->request_size; -- dma.request_indices = request->request_list; -- dma.request_sizes = request->request_sizes; -- dma.granted_count = 0; -- -- do { -- ret = ioctl( fd, DRM_IOCTL_DMA, &dma ); -- } while ( ret && errno == EAGAIN && i++ < DRM_DMA_RETRY ); -- -- if ( ret == 0 ) { -- request->granted_count = dma.granted_count; -- return 0; -- } else { -- return -errno; -- } --} -- -- --/** -- * Obtain heavyweight hardware lock. -- * -- * \param fd file descriptor. -- * \param context context. -- * \param flags flags that determine the sate of the hardware when the function -- * returns. -- * -- * \return always zero. -- * -- * \internal -- * This function translates the arguments into a drm_lock structure and issue -- * the DRM_IOCTL_LOCK ioctl until the lock is successfully acquired. -- */ --int drmGetLock(int fd, drm_context_t context, drmLockFlags flags) --{ -- drm_lock_t lock; -- -- lock.context = context; -- lock.flags = 0; -- if (flags & DRM_LOCK_READY) lock.flags |= _DRM_LOCK_READY; -- if (flags & DRM_LOCK_QUIESCENT) lock.flags |= _DRM_LOCK_QUIESCENT; -- if (flags & DRM_LOCK_FLUSH) lock.flags |= _DRM_LOCK_FLUSH; -- if (flags & DRM_LOCK_FLUSH_ALL) lock.flags |= _DRM_LOCK_FLUSH_ALL; -- if (flags & DRM_HALT_ALL_QUEUES) lock.flags |= _DRM_HALT_ALL_QUEUES; -- if (flags & DRM_HALT_CUR_QUEUES) lock.flags |= _DRM_HALT_CUR_QUEUES; -- -- while (ioctl(fd, DRM_IOCTL_LOCK, &lock)) -- ; -- return 0; --} -- --/** -- * Release the hardware lock. -- * -- * \param fd file descriptor. -- * \param context context. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_UNLOCK ioctl, passing the -- * argument in a drm_lock structure. -- */ --int drmUnlock(int fd, drm_context_t context) --{ -- drm_lock_t lock; -- -- lock.context = context; -- lock.flags = 0; -- return ioctl(fd, DRM_IOCTL_UNLOCK, &lock); --} -- --drm_context_t * drmGetReservedContextList(int fd, int *count) --{ -- drm_ctx_res_t res; -- drm_ctx_t *list; -- drm_context_t * retval; -- int i; -- -- res.count = 0; -- res.contexts = NULL; -- if (ioctl(fd, DRM_IOCTL_RES_CTX, &res)) return NULL; -- -- if (!res.count) return NULL; -- -- if (!(list = drmMalloc(res.count * sizeof(*list)))) return NULL; -- if (!(retval = drmMalloc(res.count * sizeof(*retval)))) { -- drmFree(list); -- return NULL; -- } -- -- res.contexts = list; -- if (ioctl(fd, DRM_IOCTL_RES_CTX, &res)) return NULL; -- -- for (i = 0; i < res.count; i++) retval[i] = list[i].handle; -- drmFree(list); -- -- *count = res.count; -- return retval; --} -- --void drmFreeReservedContextList(drm_context_t * pt) --{ -- drmFree(pt); --} -- --/** -- * Create context. -- * -- * Used by the X server during GLXContext initialization. This causes -- * per-context kernel-level resources to be allocated. -- * -- * \param fd file descriptor. -- * \param handle is set on success. To be used by the client when requesting DMA -- * dispatch with drmDMA(). -- * -- * \return zero on success, or a negative value on failure. -- * -- * \note May only be called by root. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_ADD_CTX ioctl, passing the -- * argument in a drm_ctx structure. -- */ --int drmCreateContext(int fd, drm_context_t * handle) --{ -- drm_ctx_t ctx; -- -- ctx.flags = 0; /* Modified with functions below */ -- if (ioctl(fd, DRM_IOCTL_ADD_CTX, &ctx)) return -errno; -- *handle = ctx.handle; -- return 0; --} -- --int drmSwitchToContext(int fd, drm_context_t context) --{ -- drm_ctx_t ctx; -- -- ctx.handle = context; -- if (ioctl(fd, DRM_IOCTL_SWITCH_CTX, &ctx)) return -errno; -- return 0; --} -- --int drmSetContextFlags(int fd, drm_context_t context, drm_context_tFlags flags) --{ -- drm_ctx_t ctx; -- -- /* Context preserving means that no context -- switched are done between DMA buffers -- from one context and the next. This is -- suitable for use in the X server (which -- promises to maintain hardware context, -- or in the client-side library when -- buffers are swapped on behalf of two -- threads. */ -- ctx.handle = context; -- ctx.flags = 0; -- if (flags & DRM_CONTEXT_PRESERVED) ctx.flags |= _DRM_CONTEXT_PRESERVED; -- if (flags & DRM_CONTEXT_2DONLY) ctx.flags |= _DRM_CONTEXT_2DONLY; -- if (ioctl(fd, DRM_IOCTL_MOD_CTX, &ctx)) return -errno; -- return 0; --} -- --int drmGetContextFlags(int fd, drm_context_t context, drm_context_tFlagsPtr flags) --{ -- drm_ctx_t ctx; -- -- ctx.handle = context; -- if (ioctl(fd, DRM_IOCTL_GET_CTX, &ctx)) return -errno; -- *flags = 0; -- if (ctx.flags & _DRM_CONTEXT_PRESERVED) *flags |= DRM_CONTEXT_PRESERVED; -- if (ctx.flags & _DRM_CONTEXT_2DONLY) *flags |= DRM_CONTEXT_2DONLY; -- return 0; --} -- --/** -- * Destroy context. -- * -- * Free any kernel-level resources allocated with drmCreateContext() associated -- * with the context. -- * -- * \param fd file descriptor. -- * \param handle handle given by drmCreateContext(). -- * -- * \return zero on success, or a negative value on failure. -- * -- * \note May only be called by root. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_RM_CTX ioctl, passing the -- * argument in a drm_ctx structure. -- */ --int drmDestroyContext(int fd, drm_context_t handle) --{ -- drm_ctx_t ctx; -- ctx.handle = handle; -- if (ioctl(fd, DRM_IOCTL_RM_CTX, &ctx)) return -errno; -- return 0; --} -- --int drmCreateDrawable(int fd, drm_drawable_t * handle) --{ -- drm_draw_t draw; -- if (ioctl(fd, DRM_IOCTL_ADD_DRAW, &draw)) return -errno; -- *handle = draw.handle; -- return 0; --} -- --int drmDestroyDrawable(int fd, drm_drawable_t handle) --{ -- drm_draw_t draw; -- draw.handle = handle; -- if (ioctl(fd, DRM_IOCTL_RM_DRAW, &draw)) return -errno; -- return 0; --} -- --int drmUpdateDrawableInfo(int fd, drm_drawable_t handle, -- drm_drawable_info_type_t type, unsigned int num, -- void *data) --{ -- drm_update_draw_t update; -- -- update.handle = handle; -- update.type = type; -- update.num = num; -- update.data = (unsigned long long)(unsigned long)data; -- -- if (ioctl(fd, DRM_IOCTL_UPDATE_DRAW, &update)) return -errno; -- -- return 0; --} -- --/** -- * Acquire the AGP device. -- * -- * Must be called before any of the other AGP related calls. -- * -- * \param fd file descriptor. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_ACQUIRE ioctl. -- */ --int drmAgpAcquire(int fd) --{ -- if (ioctl(fd, DRM_IOCTL_AGP_ACQUIRE, NULL)) return -errno; -- return 0; --} -- -- --/** -- * Release the AGP device. -- * -- * \param fd file descriptor. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_RELEASE ioctl. -- */ --int drmAgpRelease(int fd) --{ -- if (ioctl(fd, DRM_IOCTL_AGP_RELEASE, NULL)) return -errno; -- return 0; --} -- -- --/** -- * Set the AGP mode. -- * -- * \param fd file descriptor. -- * \param mode AGP mode. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_ENABLE ioctl, passing the -- * argument in a drm_agp_mode structure. -- */ --int drmAgpEnable(int fd, unsigned long mode) --{ -- drm_agp_mode_t m; -- -- m.mode = mode; -- if (ioctl(fd, DRM_IOCTL_AGP_ENABLE, &m)) return -errno; -- return 0; --} -- -- --/** -- * Allocate a chunk of AGP memory. -- * -- * \param fd file descriptor. -- * \param size requested memory size in bytes. Will be rounded to page boundary. -- * \param type type of memory to allocate. -- * \param address if not zero, will be set to the physical address of the -- * allocated memory. -- * \param handle on success will be set to a handle of the allocated memory. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_ALLOC ioctl, passing the -- * arguments in a drm_agp_buffer structure. -- */ --int drmAgpAlloc(int fd, unsigned long size, unsigned long type, -- unsigned long *address, drm_handle_t *handle) --{ -- drm_agp_buffer_t b; -- -- *handle = DRM_AGP_NO_HANDLE; -- b.size = size; -- b.handle = 0; -- b.type = type; -- if (ioctl(fd, DRM_IOCTL_AGP_ALLOC, &b)) return -errno; -- if (address != 0UL) *address = b.physical; -- *handle = b.handle; -- return 0; --} -- -- --/** -- * Free a chunk of AGP memory. -- * -- * \param fd file descriptor. -- * \param handle handle to the allocated memory, as given by drmAgpAllocate(). -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_FREE ioctl, passing the -- * argument in a drm_agp_buffer structure. -- */ --int drmAgpFree(int fd, drm_handle_t handle) --{ -- drm_agp_buffer_t b; -- -- b.size = 0; -- b.handle = handle; -- if (ioctl(fd, DRM_IOCTL_AGP_FREE, &b)) return -errno; -- return 0; --} -- -- --/** -- * Bind a chunk of AGP memory. -- * -- * \param fd file descriptor. -- * \param handle handle to the allocated memory, as given by drmAgpAllocate(). -- * \param offset offset in bytes. It will round to page boundary. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_BIND ioctl, passing the -- * argument in a drm_agp_binding structure. -- */ --int drmAgpBind(int fd, drm_handle_t handle, unsigned long offset) --{ -- drm_agp_binding_t b; -- -- b.handle = handle; -- b.offset = offset; -- if (ioctl(fd, DRM_IOCTL_AGP_BIND, &b)) return -errno; -- return 0; --} -- -- --/** -- * Unbind a chunk of AGP memory. -- * -- * \param fd file descriptor. -- * \param handle handle to the allocated memory, as given by drmAgpAllocate(). -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_UNBIND ioctl, passing -- * the argument in a drm_agp_binding structure. -- */ --int drmAgpUnbind(int fd, drm_handle_t handle) --{ -- drm_agp_binding_t b; -- -- b.handle = handle; -- b.offset = 0; -- if (ioctl(fd, DRM_IOCTL_AGP_UNBIND, &b)) return -errno; -- return 0; --} -- -- --/** -- * Get AGP driver major version number. -- * -- * \param fd file descriptor. -- * -- * \return major version number on success, or a negative value on failure.. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the -- * necessary information in a drm_agp_info structure. -- */ --int drmAgpVersionMajor(int fd) --{ -- drm_agp_info_t i; -- -- if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return -errno; -- return i.agp_version_major; --} -- -- --/** -- * Get AGP driver minor version number. -- * -- * \param fd file descriptor. -- * -- * \return minor version number on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the -- * necessary information in a drm_agp_info structure. -- */ --int drmAgpVersionMinor(int fd) --{ -- drm_agp_info_t i; -- -- if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return -errno; -- return i.agp_version_minor; --} -- -- --/** -- * Get AGP mode. -- * -- * \param fd file descriptor. -- * -- * \return mode on success, or zero on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the -- * necessary information in a drm_agp_info structure. -- */ --unsigned long drmAgpGetMode(int fd) --{ -- drm_agp_info_t i; -- -- if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0; -- return i.mode; --} -- -- --/** -- * Get AGP aperture base. -- * -- * \param fd file descriptor. -- * -- * \return aperture base on success, zero on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the -- * necessary information in a drm_agp_info structure. -- */ --unsigned long drmAgpBase(int fd) --{ -- drm_agp_info_t i; -- -- if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0; -- return i.aperture_base; --} -- -- --/** -- * Get AGP aperture size. -- * -- * \param fd file descriptor. -- * -- * \return aperture size on success, zero on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the -- * necessary information in a drm_agp_info structure. -- */ --unsigned long drmAgpSize(int fd) --{ -- drm_agp_info_t i; -- -- if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0; -- return i.aperture_size; --} -- -- --/** -- * Get used AGP memory. -- * -- * \param fd file descriptor. -- * -- * \return memory used on success, or zero on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the -- * necessary information in a drm_agp_info structure. -- */ --unsigned long drmAgpMemoryUsed(int fd) --{ -- drm_agp_info_t i; -- -- if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0; -- return i.memory_used; --} -- -- --/** -- * Get available AGP memory. -- * -- * \param fd file descriptor. -- * -- * \return memory available on success, or zero on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the -- * necessary information in a drm_agp_info structure. -- */ --unsigned long drmAgpMemoryAvail(int fd) --{ -- drm_agp_info_t i; -- -- if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0; -- return i.memory_allowed; --} -- -- --/** -- * Get hardware vendor ID. -- * -- * \param fd file descriptor. -- * -- * \return vendor ID on success, or zero on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the -- * necessary information in a drm_agp_info structure. -- */ --unsigned int drmAgpVendorId(int fd) --{ -- drm_agp_info_t i; -- -- if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0; -- return i.id_vendor; --} -- -- --/** -- * Get hardware device ID. -- * -- * \param fd file descriptor. -- * -- * \return zero on success, or zero on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_AGP_INFO ioctl, getting the -- * necessary information in a drm_agp_info structure. -- */ --unsigned int drmAgpDeviceId(int fd) --{ -- drm_agp_info_t i; -- -- if (ioctl(fd, DRM_IOCTL_AGP_INFO, &i)) return 0; -- return i.id_device; --} -- --int drmScatterGatherAlloc(int fd, unsigned long size, drm_handle_t *handle) --{ -- drm_scatter_gather_t sg; -- -- *handle = 0; -- sg.size = size; -- sg.handle = 0; -- if (ioctl(fd, DRM_IOCTL_SG_ALLOC, &sg)) return -errno; -- *handle = sg.handle; -- return 0; --} -- --int drmScatterGatherFree(int fd, drm_handle_t handle) --{ -- drm_scatter_gather_t sg; -- -- sg.size = 0; -- sg.handle = handle; -- if (ioctl(fd, DRM_IOCTL_SG_FREE, &sg)) return -errno; -- return 0; --} -- --/** -- * Wait for VBLANK. -- * -- * \param fd file descriptor. -- * \param vbl pointer to a drmVBlank structure. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_WAIT_VBLANK ioctl. -- */ --int drmWaitVBlank(int fd, drmVBlankPtr vbl) --{ -- int ret; -- -- do { -- ret = ioctl(fd, DRM_IOCTL_WAIT_VBLANK, vbl); -- vbl->request.type &= ~DRM_VBLANK_RELATIVE; -- } while (ret && errno == EINTR); -- -- return ret; --} -- --int drmError(int err, const char *label) --{ -- switch (err) { -- case DRM_ERR_NO_DEVICE: fprintf(stderr, "%s: no device\n", label); break; -- case DRM_ERR_NO_ACCESS: fprintf(stderr, "%s: no access\n", label); break; -- case DRM_ERR_NOT_ROOT: fprintf(stderr, "%s: not root\n", label); break; -- case DRM_ERR_INVALID: fprintf(stderr, "%s: invalid args\n", label);break; -- default: -- if (err < 0) err = -err; -- fprintf( stderr, "%s: error %d (%s)\n", label, err, strerror(err) ); -- break; -- } -- -- return 1; --} -- --/** -- * Install IRQ handler. -- * -- * \param fd file descriptor. -- * \param irq IRQ number. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_CONTROL ioctl, passing the -- * argument in a drm_control structure. -- */ --int drmCtlInstHandler(int fd, int irq) --{ -- drm_control_t ctl; -- -- ctl.func = DRM_INST_HANDLER; -- ctl.irq = irq; -- if (ioctl(fd, DRM_IOCTL_CONTROL, &ctl)) return -errno; -- return 0; --} -- -- --/** -- * Uninstall IRQ handler. -- * -- * \param fd file descriptor. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_CONTROL ioctl, passing the -- * argument in a drm_control structure. -- */ --int drmCtlUninstHandler(int fd) --{ -- drm_control_t ctl; -- -- ctl.func = DRM_UNINST_HANDLER; -- ctl.irq = 0; -- if (ioctl(fd, DRM_IOCTL_CONTROL, &ctl)) return -errno; -- return 0; --} -- --int drmFinish(int fd, int context, drmLockFlags flags) --{ -- drm_lock_t lock; -- -- lock.context = context; -- lock.flags = 0; -- if (flags & DRM_LOCK_READY) lock.flags |= _DRM_LOCK_READY; -- if (flags & DRM_LOCK_QUIESCENT) lock.flags |= _DRM_LOCK_QUIESCENT; -- if (flags & DRM_LOCK_FLUSH) lock.flags |= _DRM_LOCK_FLUSH; -- if (flags & DRM_LOCK_FLUSH_ALL) lock.flags |= _DRM_LOCK_FLUSH_ALL; -- if (flags & DRM_HALT_ALL_QUEUES) lock.flags |= _DRM_HALT_ALL_QUEUES; -- if (flags & DRM_HALT_CUR_QUEUES) lock.flags |= _DRM_HALT_CUR_QUEUES; -- if (ioctl(fd, DRM_IOCTL_FINISH, &lock)) return -errno; -- return 0; --} -- --/** -- * Get IRQ from bus ID. -- * -- * \param fd file descriptor. -- * \param busnum bus number. -- * \param devnum device number. -- * \param funcnum function number. -- * -- * \return IRQ number on success, or a negative value on failure. -- * -- * \internal -- * This function is a wrapper around the DRM_IOCTL_IRQ_BUSID ioctl, passing the -- * arguments in a drm_irq_busid structure. -- */ --int drmGetInterruptFromBusID(int fd, int busnum, int devnum, int funcnum) --{ -- drm_irq_busid_t p; -- -- p.busnum = busnum; -- p.devnum = devnum; -- p.funcnum = funcnum; -- if (ioctl(fd, DRM_IOCTL_IRQ_BUSID, &p)) return -errno; -- return p.irq; --} -- --int drmAddContextTag(int fd, drm_context_t context, void *tag) --{ -- drmHashEntry *entry = drmGetEntry(fd); -- -- if (drmHashInsert(entry->tagTable, context, tag)) { -- drmHashDelete(entry->tagTable, context); -- drmHashInsert(entry->tagTable, context, tag); -- } -- return 0; --} -- --int drmDelContextTag(int fd, drm_context_t context) --{ -- drmHashEntry *entry = drmGetEntry(fd); -- -- return drmHashDelete(entry->tagTable, context); --} -- --void *drmGetContextTag(int fd, drm_context_t context) --{ -- drmHashEntry *entry = drmGetEntry(fd); -- void *value; -- -- if (drmHashLookup(entry->tagTable, context, &value)) return NULL; -- -- return value; --} -- --int drmAddContextPrivateMapping(int fd, drm_context_t ctx_id, drm_handle_t handle) --{ -- drm_ctx_priv_map_t map; -- -- map.ctx_id = ctx_id; -- map.handle = (void *)(unsigned long)handle; -- -- if (ioctl(fd, DRM_IOCTL_SET_SAREA_CTX, &map)) return -errno; -- return 0; --} -- --int drmGetContextPrivateMapping(int fd, drm_context_t ctx_id, drm_handle_t * handle) --{ -- drm_ctx_priv_map_t map; -- -- map.ctx_id = ctx_id; -- -- if (ioctl(fd, DRM_IOCTL_GET_SAREA_CTX, &map)) return -errno; -- if (handle) *handle = (drm_handle_t)(unsigned long)map.handle; -- -- return 0; --} -- --int drmGetMap(int fd, int idx, drm_handle_t *offset, drmSize *size, -- drmMapType *type, drmMapFlags *flags, drm_handle_t *handle, -- int *mtrr) --{ -- drm_map_t map; -- -- map.offset = idx; -- if (ioctl(fd, DRM_IOCTL_GET_MAP, &map)) return -errno; -- *offset = map.offset; -- *size = map.size; -- *type = map.type; -- *flags = map.flags; -- *handle = (drm_handle_t)(unsigned long)map.handle; -- *mtrr = map.mtrr; -- return 0; --} -- --int drmGetClient(int fd, int idx, int *auth, int *pid, int *uid, -- unsigned long *magic, unsigned long *iocs) --{ -- drm_client_t client; -- -- client.idx = idx; -- if (ioctl(fd, DRM_IOCTL_GET_CLIENT, &client)) return -errno; -- *auth = client.auth; -- *pid = client.pid; -- *uid = client.uid; -- *magic = client.magic; -- *iocs = client.iocs; -- return 0; --} -- --int drmGetStats(int fd, drmStatsT *stats) --{ -- drm_stats_t s; -- unsigned int i; -- -- if (ioctl(fd, DRM_IOCTL_GET_STATS, &s)) return -errno; -- -- stats->count = 0; -- memset(stats, 0, sizeof(*stats)); -- if (s.count > sizeof(stats->data)/sizeof(stats->data[0])) -- return -1; -- --#define SET_VALUE \ -- stats->data[i].long_format = "%-20.20s"; \ -- stats->data[i].rate_format = "%8.8s"; \ -- stats->data[i].isvalue = 1; \ -- stats->data[i].verbose = 0 -- --#define SET_COUNT \ -- stats->data[i].long_format = "%-20.20s"; \ -- stats->data[i].rate_format = "%5.5s"; \ -- stats->data[i].isvalue = 0; \ -- stats->data[i].mult_names = "kgm"; \ -- stats->data[i].mult = 1000; \ -- stats->data[i].verbose = 0 -- --#define SET_BYTE \ -- stats->data[i].long_format = "%-20.20s"; \ -- stats->data[i].rate_format = "%5.5s"; \ -- stats->data[i].isvalue = 0; \ -- stats->data[i].mult_names = "KGM"; \ -- stats->data[i].mult = 1024; \ -- stats->data[i].verbose = 0 -- -- -- stats->count = s.count; -- for (i = 0; i < s.count; i++) { -- stats->data[i].value = s.data[i].value; -- switch (s.data[i].type) { -- case _DRM_STAT_LOCK: -- stats->data[i].long_name = "Lock"; -- stats->data[i].rate_name = "Lock"; -- SET_VALUE; -- break; -- case _DRM_STAT_OPENS: -- stats->data[i].long_name = "Opens"; -- stats->data[i].rate_name = "O"; -- SET_COUNT; -- stats->data[i].verbose = 1; -- break; -- case _DRM_STAT_CLOSES: -- stats->data[i].long_name = "Closes"; -- stats->data[i].rate_name = "Lock"; -- SET_COUNT; -- stats->data[i].verbose = 1; -- break; -- case _DRM_STAT_IOCTLS: -- stats->data[i].long_name = "Ioctls"; -- stats->data[i].rate_name = "Ioc/s"; -- SET_COUNT; -- break; -- case _DRM_STAT_LOCKS: -- stats->data[i].long_name = "Locks"; -- stats->data[i].rate_name = "Lck/s"; -- SET_COUNT; -- break; -- case _DRM_STAT_UNLOCKS: -- stats->data[i].long_name = "Unlocks"; -- stats->data[i].rate_name = "Unl/s"; -- SET_COUNT; -- break; -- case _DRM_STAT_IRQ: -- stats->data[i].long_name = "IRQs"; -- stats->data[i].rate_name = "IRQ/s"; -- SET_COUNT; -- break; -- case _DRM_STAT_PRIMARY: -- stats->data[i].long_name = "Primary Bytes"; -- stats->data[i].rate_name = "PB/s"; -- SET_BYTE; -- break; -- case _DRM_STAT_SECONDARY: -- stats->data[i].long_name = "Secondary Bytes"; -- stats->data[i].rate_name = "SB/s"; -- SET_BYTE; -- break; -- case _DRM_STAT_DMA: -- stats->data[i].long_name = "DMA"; -- stats->data[i].rate_name = "DMA/s"; -- SET_COUNT; -- break; -- case _DRM_STAT_SPECIAL: -- stats->data[i].long_name = "Special DMA"; -- stats->data[i].rate_name = "dma/s"; -- SET_COUNT; -- break; -- case _DRM_STAT_MISSED: -- stats->data[i].long_name = "Miss"; -- stats->data[i].rate_name = "Ms/s"; -- SET_COUNT; -- break; -- case _DRM_STAT_VALUE: -- stats->data[i].long_name = "Value"; -- stats->data[i].rate_name = "Value"; -- SET_VALUE; -- break; -- case _DRM_STAT_BYTE: -- stats->data[i].long_name = "Bytes"; -- stats->data[i].rate_name = "B/s"; -- SET_BYTE; -- break; -- case _DRM_STAT_COUNT: -- default: -- stats->data[i].long_name = "Count"; -- stats->data[i].rate_name = "Cnt/s"; -- SET_COUNT; -- break; -- } -- } -- return 0; --} -- --/** -- * Issue a set-version ioctl. -- * -- * \param fd file descriptor. -- * \param drmCommandIndex command index -- * \param data source pointer of the data to be read and written. -- * \param size size of the data to be read and written. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * It issues a read-write ioctl given by -- * \code DRM_COMMAND_BASE + drmCommandIndex \endcode. -- */ --int drmSetInterfaceVersion(int fd, drmSetVersion *version ) --{ -- int retcode = 0; -- drm_set_version_t sv; -- -- sv.drm_di_major = version->drm_di_major; -- sv.drm_di_minor = version->drm_di_minor; -- sv.drm_dd_major = version->drm_dd_major; -- sv.drm_dd_minor = version->drm_dd_minor; -- -- if (ioctl(fd, DRM_IOCTL_SET_VERSION, &sv)) { -- retcode = -errno; -- } -- -- version->drm_di_major = sv.drm_di_major; -- version->drm_di_minor = sv.drm_di_minor; -- version->drm_dd_major = sv.drm_dd_major; -- version->drm_dd_minor = sv.drm_dd_minor; -- -- return retcode; --} -- --/** -- * Send a device-specific command. -- * -- * \param fd file descriptor. -- * \param drmCommandIndex command index -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * It issues a ioctl given by -- * \code DRM_COMMAND_BASE + drmCommandIndex \endcode. -- */ --int drmCommandNone(int fd, unsigned long drmCommandIndex) --{ -- void *data = NULL; /* dummy */ -- unsigned long request; -- -- request = DRM_IO( DRM_COMMAND_BASE + drmCommandIndex); -- -- if (ioctl(fd, request, data)) { -- return -errno; -- } -- return 0; --} -- -- --/** -- * Send a device-specific read command. -- * -- * \param fd file descriptor. -- * \param drmCommandIndex command index -- * \param data destination pointer of the data to be read. -- * \param size size of the data to be read. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * It issues a read ioctl given by -- * \code DRM_COMMAND_BASE + drmCommandIndex \endcode. -- */ --int drmCommandRead(int fd, unsigned long drmCommandIndex, -- void *data, unsigned long size ) --{ -- unsigned long request; -- -- request = DRM_IOC( DRM_IOC_READ, DRM_IOCTL_BASE, -- DRM_COMMAND_BASE + drmCommandIndex, size); -- -- if (ioctl(fd, request, data)) { -- return -errno; -- } -- return 0; --} -- -- --/** -- * Send a device-specific write command. -- * -- * \param fd file descriptor. -- * \param drmCommandIndex command index -- * \param data source pointer of the data to be written. -- * \param size size of the data to be written. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * It issues a write ioctl given by -- * \code DRM_COMMAND_BASE + drmCommandIndex \endcode. -- */ --int drmCommandWrite(int fd, unsigned long drmCommandIndex, -- void *data, unsigned long size ) --{ -- unsigned long request; -- -- request = DRM_IOC( DRM_IOC_WRITE, DRM_IOCTL_BASE, -- DRM_COMMAND_BASE + drmCommandIndex, size); -- -- if (ioctl(fd, request, data)) { -- return -errno; -- } -- return 0; --} -- -- --/** -- * Send a device-specific read-write command. -- * -- * \param fd file descriptor. -- * \param drmCommandIndex command index -- * \param data source pointer of the data to be read and written. -- * \param size size of the data to be read and written. -- * -- * \return zero on success, or a negative value on failure. -- * -- * \internal -- * It issues a read-write ioctl given by -- * \code DRM_COMMAND_BASE + drmCommandIndex \endcode. -- */ --int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, -- void *data, unsigned long size ) --{ -- unsigned long request; -- -- request = DRM_IOC( DRM_IOC_READ|DRM_IOC_WRITE, DRM_IOCTL_BASE, -- DRM_COMMAND_BASE + drmCommandIndex, size); -- -- if (ioctl(fd, request, data)) { -- return -errno; -- } -- return 0; --} -- --static void drmSIGIOHandler(int interrupt, void *closure) --{ -- unsigned long key; -- void *value; -- ssize_t count; -- drm_ctx_t ctx; -- typedef void (*_drmCallback)(int, void *, void *); -- char buf[256]; -- drm_context_t old; -- drm_context_t new; -- void *oldctx; -- void *newctx; -- char *pt; -- drmHashEntry *entry; -- -- if (!drmHashTable) return; -- if (drmHashFirst(drmHashTable, &key, &value)) { -- entry = value; -- do { --#if 0 -- fprintf(stderr, "Trying %d\n", entry->fd); --#endif -- if ((count = read(entry->fd, buf, sizeof(buf))) > 0) { -- buf[count] = '\0'; --#if 0 -- fprintf(stderr, "Got %s\n", buf); --#endif -- -- for (pt = buf; *pt != ' '; ++pt); /* Find first space */ -- ++pt; -- old = strtol(pt, &pt, 0); -- new = strtol(pt, NULL, 0); -- oldctx = drmGetContextTag(entry->fd, old); -- newctx = drmGetContextTag(entry->fd, new); --#if 0 -- fprintf(stderr, "%d %d %p %p\n", old, new, oldctx, newctx); --#endif -- ((_drmCallback)entry->f)(entry->fd, oldctx, newctx); -- ctx.handle = new; -- ioctl(entry->fd, DRM_IOCTL_NEW_CTX, &ctx); -- } -- } while (drmHashNext(drmHashTable, &key, &value)); -- } --} -- --int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)) --{ -- drmHashEntry *entry; -- -- entry = drmGetEntry(fd); -- entry->f = f; -- -- return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0); --} -- --int drmRemoveSIGIOHandler(int fd) --{ -- drmHashEntry *entry = drmGetEntry(fd); -- -- entry->f = NULL; -- -- return xf86RemoveSIGIOHandler(fd); --} -- --/* -- * Valid flags are -- * DRM_FENCE_FLAG_EMIT -- * DRM_FENCE_FLAG_SHAREABLE -- * DRM_FENCE_MASK_DRIVER -- */ -- --int drmFenceCreate(int fd, unsigned flags, int class,unsigned type, -- drmFence *fence) --{ -- drm_fence_arg_t arg; -- -- memset(&arg, 0, sizeof(arg)); -- arg.type = type; -- arg.class = class; -- arg.op = drm_fence_create; -- if (ioctl(fd, DRM_IOCTL_FENCE, &arg)) -- return -errno; -- fence->handle = arg.handle; -- fence->class = arg.class; -- fence->type = arg.type; -- fence->flags = arg.flags; -- fence->signaled = 0; -- return 0; --} -- --/* -- * Valid flags are -- * DRM_FENCE_FLAG_SHAREABLE -- * DRM_FENCE_MASK_DRIVER -- */ -- --int drmFenceBuffers(int fd, unsigned flags, drmFence *fence) --{ -- drm_fence_arg_t arg; -- -- memset(&arg, 0, sizeof(arg)); -- arg.flags = flags; -- arg.op = drm_fence_buffers; -- if (ioctl(fd, DRM_IOCTL_FENCE, &arg)) -- return -errno; -- fence->handle = arg.handle; -- fence->class = arg.class; -- fence->type = arg.type; -- fence->flags = arg.flags; -- fence->signaled = 0; -- return 0; --} -- --int drmFenceDestroy(int fd, const drmFence *fence) --{ -- drm_fence_arg_t arg; -- -- memset(&arg, 0, sizeof(arg)); -- arg.handle = fence->handle; -- arg.op = drm_fence_destroy; -- if (ioctl(fd, DRM_IOCTL_FENCE, &arg)) -- return -errno; -- return 0; --} -- --int drmFenceReference(int fd, unsigned handle, drmFence *fence) --{ -- drm_fence_arg_t arg; -- -- memset(&arg, 0, sizeof(arg)); -- arg.handle = handle; -- arg.op = drm_fence_reference; -- if (ioctl(fd, DRM_IOCTL_FENCE, &arg)) -- return -errno; -- fence->handle = arg.handle; -- fence->class = arg.class; -- fence->type = arg.type; -- fence->flags = arg.flags; -- fence->signaled = arg.signaled; -- return 0; --} -- --int drmFenceUnreference(int fd, const drmFence *fence) --{ -- drm_fence_arg_t arg; -- -- memset(&arg, 0, sizeof(arg)); -- arg.handle = fence->handle; -- arg.op = drm_fence_unreference; -- if (ioctl(fd, DRM_IOCTL_FENCE, &arg)) -- return -errno; -- return 0; --} -- --int drmFenceFlush(int fd, drmFence *fence, unsigned flush_type) --{ -- drm_fence_arg_t arg; -- -- memset(&arg, 0, sizeof(arg)); -- arg.handle = fence->handle; -- arg.type = flush_type; -- arg.op = drm_fence_flush; -- if (ioctl(fd, DRM_IOCTL_FENCE, &arg)) -- return -errno; -- fence->class = arg.class; -- fence->type = arg.type; -- fence->signaled = arg.signaled; -- return 0; --} -- --int drmFenceUpdate(int fd, drmFence *fence) --{ -- drm_fence_arg_t arg; -- -- memset(&arg, 0, sizeof(arg)); -- arg.handle = fence->handle; -- arg.op = drm_fence_signaled; -- if (ioctl(fd, DRM_IOCTL_FENCE, &arg)) -- return -errno; -- fence->class = arg.class; -- fence->type = arg.type; -- fence->signaled = arg.signaled; -- return 0; --} -- --int drmFenceSignaled(int fd, drmFence *fence, unsigned fenceType, -- int *signaled) --{ -- int -- ret; -- -- if ((fence->flags & DRM_FENCE_FLAG_SHAREABLE) || -- ((fenceType & fence->signaled) != fenceType)) { -- -- ret = drmFenceFlush(fd, fence, fenceType); -- if (ret) -- return ret; -- } -- -- *signaled = ((fenceType & fence->signaled) == fenceType); -- -- return 0; --} -- --/* -- * Valid flags are -- * DRM_FENCE_FLAG_SHAREABLE -- * DRM_FENCE_MASK_DRIVER -- */ -- -- --int drmFenceEmit(int fd, unsigned flags, drmFence *fence, unsigned emit_type) --{ -- drm_fence_arg_t arg; -- -- memset(&arg, 0, sizeof(arg)); -- arg.flags = flags; -- arg.handle = fence->handle; -- arg.type = emit_type; -- arg.op = drm_fence_emit; -- if (ioctl(fd, DRM_IOCTL_FENCE, &arg)) -- return -errno; -- fence->class = arg.class; -- fence->type = arg.type; -- fence->signaled = arg.signaled; -- return 0; --} -- --/* -- * Valid flags are -- * DRM_FENCE_FLAG_WAIT_LAZY -- * DRM_FENCE_FLAG_WAIT_IGNORE_SIGNALS -- */ -- --int drmFenceWait(int fd, unsigned flags, drmFence *fence, unsigned flush_type) --{ -- drm_fence_arg_t arg; -- int ret; -- -- if (flush_type == 0) { -- flush_type = fence->type; -- } -- -- if (!(fence->flags & DRM_FENCE_FLAG_SHAREABLE)) { -- if ((flush_type & fence->signaled) == flush_type) { -- return 0; -- } -- } -- -- memset(&arg, 0, sizeof(arg)); -- arg.handle = fence->handle; -- arg.type = flush_type; -- arg.flags = flags; -- arg.op = drm_fence_wait; -- do { -- ret = ioctl(fd, DRM_IOCTL_FENCE, &arg); -- } while (ret != 0 && errno == EAGAIN); -- -- if (ret) -- return -errno; -- -- fence->class = arg.class; -- fence->type = arg.type; -- fence->signaled = arg.signaled; -- return 0; --} -- --static int drmAdjustListNodes(drmBOList *list) --{ -- drmBONode *node; -- drmMMListHead *l; -- int ret = 0; -- -- while(list->numCurrent < list->numTarget) { -- node = (drmBONode *) malloc(sizeof(*node)); -- if (!node) { -- ret = -ENOMEM; -- break; -- } -- list->numCurrent++; -- DRMLISTADD(&node->head, &list->free); -- } -- -- while(list->numCurrent > list->numTarget) { -- l = list->free.next; -- if (l == &list->free) -- break; -- DRMLISTDEL(l); -- node = DRMLISTENTRY(drmBONode, l, head); -- free(node); -- list->numCurrent--; -- } -- return ret; --} -- --void drmBOFreeList(drmBOList *list) --{ -- drmBONode *node; -- drmMMListHead *l; -- -- l = list->list.next; -- while(l != &list->list) { -- DRMLISTDEL(l); -- node = DRMLISTENTRY(drmBONode, l, head); -- free(node); -- l = list->free.next; -- list->numCurrent--; -- list->numOnList--; -- } -- -- l = list->free.next; -- while(l != &list->free) { -- DRMLISTDEL(l); -- node = DRMLISTENTRY(drmBONode, l, head); -- free(node); -- l = list->free.next; -- list->numCurrent--; -- } --} -- --int drmBOResetList(drmBOList *list) { -- -- drmMMListHead *l; -- int ret; -- -- ret = drmAdjustListNodes(list); -- if (ret) -- return ret; -- -- l = list->list.next; -- while(l != &list->list) { -- DRMLISTDEL(l); -- DRMLISTADD(l, &list->free); -- list->numOnList--; -- l = list->list.next; -- } -- return drmAdjustListNodes(list); --} -- --static drmBONode *drmAddListItem(drmBOList *list, drmBO *item, -- unsigned long arg0, -- unsigned long arg1) --{ -- drmBONode *node; -- drmMMListHead *l; -- -- l = list->free.next; -- if (l == &list->free) { -- node = (drmBONode *) malloc(sizeof(*node)); -- if (!node) { -- return NULL; -- } -- list->numCurrent++; -- } else { -- DRMLISTDEL(l); -- node = DRMLISTENTRY(drmBONode, l, head); -- } -- node->buf = item; -- node->arg0 = arg0; -- node->arg1 = arg1; -- DRMLISTADD(&node->head, &list->list); -- list->numOnList++; -- return node; --} -- --void *drmBOListIterator(drmBOList *list) --{ -- void *ret = list->list.next; -- -- if (ret == &list->list) -- return NULL; -- return ret; --} -- --void *drmBOListNext(drmBOList *list, void *iterator) --{ -- void *ret; -- -- drmMMListHead *l = (drmMMListHead *) iterator; -- ret = l->next; -- if (ret == &list->list) -- return NULL; -- return ret; --} -- --drmBO *drmBOListBuf(void *iterator) --{ -- drmBONode *node; -- drmMMListHead *l = (drmMMListHead *) iterator; -- node = DRMLISTENTRY(drmBONode, l, head); -- -- return node->buf; --} -- -- --int drmBOCreateList(int numTarget, drmBOList *list) --{ -- DRMINITLISTHEAD(&list->list); -- DRMINITLISTHEAD(&list->free); -- list->numTarget = numTarget; -- list->numCurrent = 0; -- list->numOnList = 0; -- return drmAdjustListNodes(list); --} -- --static void drmBOCopyReply(const drm_bo_arg_reply_t *rep, -- drmBO *buf) --{ -- buf->handle = rep->handle; -- buf->flags = rep->flags; -- buf->size = rep->size; -- buf->offset = rep->offset; -- buf->mapHandle = rep->arg_handle; -- buf->mask = rep->mask; -- buf->start = rep->buffer_start; -- buf->fenceFlags = rep->fence_flags; -- buf->replyFlags = rep->rep_flags; -- buf->pageAlignment = rep->page_alignment; --} -- -- -- --int drmBOCreate(int fd, unsigned long start, unsigned long size, -- unsigned pageAlignment, void *user_buffer, drm_bo_type_t type, -- unsigned mask, -- unsigned hint, drmBO *buf) --{ -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- int ret; -- -- memset(buf, 0, sizeof(*buf)); -- memset(&arg, 0, sizeof(arg)); -- req->mask = mask; -- req->hint = hint; -- req->size = size; -- req->type = type; -- req->page_alignment = pageAlignment; -- -- buf->virtual = NULL; -- -- switch(type) { -- case drm_bo_type_dc: -- req->buffer_start = start; -- break; -- case drm_bo_type_user: -- req->buffer_start = (unsigned long) user_buffer; -- buf->virtual = user_buffer; -- break; -- case drm_bo_type_fake: -- req->buffer_start = start; -- break; -- default: -- return -EINVAL; -- } -- req->op = drm_bo_create; -- -- do { -- ret = ioctl(fd, DRM_IOCTL_BUFOBJ, &arg); -- } while (ret != 0 && errno == EAGAIN); -- -- if (ret) -- return -errno; -- if (!arg.handled) { -- return -EFAULT; -- } -- if (rep->ret) { -- fprintf(stderr, "Error %d\n", rep->ret); -- return rep->ret; -- } -- -- drmBOCopyReply(rep, buf); -- buf->mapVirtual = NULL; -- buf->mapCount = 0; -- -- return 0; --} -- --int drmBODestroy(int fd, drmBO *buf) --{ -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- -- if (buf->mapVirtual && (buf->type != drm_bo_type_fake)) { -- (void) drmUnmap(buf->mapVirtual, buf->start + buf->size); -- buf->mapVirtual = NULL; -- buf->virtual = NULL; -- } -- -- memset(&arg, 0, sizeof(arg)); -- req->handle = buf->handle; -- req->op = drm_bo_destroy; -- -- if (ioctl(fd, DRM_IOCTL_BUFOBJ, &arg)) -- return -errno; -- if (!arg.handled) { -- return -EFAULT; -- } -- if (rep->ret) { -- return rep->ret; -- } -- -- buf->handle = 0; -- return 0; --} -- --int drmBOReference(int fd, unsigned handle, drmBO *buf) --{ -- -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- -- memset(&arg, 0, sizeof(arg)); -- req->handle = handle; -- req->op = drm_bo_reference; -- -- if (ioctl(fd, DRM_IOCTL_BUFOBJ, &arg)) -- return -errno; -- if (!arg.handled) { -- return -EFAULT; -- } -- if (rep->ret) { -- return rep->ret; -- } -- -- drmBOCopyReply(rep, buf); -- buf->type = drm_bo_type_dc; -- buf->mapVirtual = NULL; -- buf->mapCount = 0; -- buf->virtual = NULL; -- -- return 0; --} -- --int drmBOUnReference(int fd, drmBO *buf) --{ -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- -- -- if (buf->mapVirtual && (buf->type != drm_bo_type_fake)) { -- (void) munmap(buf->mapVirtual, buf->start + buf->size); -- buf->mapVirtual = NULL; -- buf->virtual = NULL; -- } -- -- memset(&arg, 0, sizeof(arg)); -- req->handle = buf->handle; -- req->op = drm_bo_unreference; -- -- if (ioctl(fd, DRM_IOCTL_BUFOBJ, &arg)) -- return -errno; -- if (!arg.handled) { -- return -EFAULT; -- } -- if (rep->ret) { -- return rep->ret; -- } -- -- buf->handle = 0; -- return 0; --} -- --/* -- * Flags can be DRM_BO_FLAG_READ, DRM_BO_FLAG_WRITE or'ed together -- * Hint currently be DRM_BO_HINT_DONT_BLOCK, which makes the -- * call return an -EBUSY if it can' immediately honor the mapping request. -- */ -- --int drmBOMap(int fd, drmBO *buf, unsigned mapFlags, unsigned mapHint, -- void **address) --{ -- -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- int ret = 0; -- -- /* -- * Make sure we have a virtual address of the buffer. -- */ -- -- if (!buf->virtual && buf->type != drm_bo_type_fake) { -- drmAddress virtual; -- virtual = mmap(0, buf->size + buf->start, -- PROT_READ | PROT_WRITE, MAP_SHARED, -- fd, buf->mapHandle); -- if (virtual == MAP_FAILED) { -- ret = -errno; -- } -- if (ret) -- return ret; -- buf->mapVirtual = virtual; -- buf->virtual = ((char *) virtual) + buf->start; -- } -- -- memset(&arg, 0, sizeof(arg)); -- req->handle = buf->handle; -- req->mask = mapFlags; -- req->hint = mapHint; -- req->op = drm_bo_map; -- -- /* -- * May hang if the buffer object is busy. -- * This IOCTL synchronizes the buffer. -- */ -- -- do { -- ret = ioctl(fd, DRM_IOCTL_BUFOBJ, &arg); -- } while (ret != 0 && errno == EAGAIN); -- -- if (ret) -- return ret; -- if (!arg.handled) -- return -EFAULT; -- if (rep->ret) -- return rep->ret; -- -- drmBOCopyReply(rep, buf); -- buf->mapFlags = mapFlags; -- ++buf->mapCount; -- *address = buf->virtual; -- -- return 0; --} -- --int drmBOUnmap(int fd, drmBO *buf) --{ -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- -- -- memset(&arg, 0, sizeof(arg)); -- req->handle = buf->handle; -- req->op = drm_bo_unmap; -- -- if (ioctl(fd, DRM_IOCTL_BUFOBJ, &arg)) { -- return -errno; -- } -- if (!arg.handled) -- return -EFAULT; -- if (rep->ret) -- return rep->ret; -- -- return 0; --} -- --int drmBOValidate(int fd, drmBO *buf, unsigned flags, unsigned mask, -- unsigned hint) --{ -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- int ret = 0; -- -- memset(&arg, 0, sizeof(arg)); -- req->handle = buf->handle; -- req->mask = flags; -- req->hint = hint; -- req->arg_handle = mask; /* Encode mask in the arg_handle field :/ */ -- req->op = drm_bo_validate; -- -- do{ -- ret = ioctl(fd, DRM_IOCTL_BUFOBJ, &arg); -- } while (ret && errno == EAGAIN); -- -- if (ret) -- return ret; -- if (!arg.handled) -- return -EFAULT; -- if (rep->ret) -- return rep->ret; -- -- drmBOCopyReply(rep, buf); -- return 0; --} -- -- --int drmBOFence(int fd, drmBO *buf, unsigned flags, unsigned fenceHandle) --{ -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- int ret = 0; -- -- memset(&arg, 0, sizeof(arg)); -- req->handle = buf->handle; -- req->mask = flags; -- req->arg_handle = fenceHandle; -- req->op = drm_bo_validate; -- -- ret = ioctl(fd, DRM_IOCTL_BUFOBJ, &arg); -- -- if (ret) -- return ret; -- if (!arg.handled) -- return -EFAULT; -- if (rep->ret) -- return rep->ret; -- return 0; --} -- --int drmBOInfo(int fd, drmBO *buf) --{ -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- int ret = 0; -- -- memset(&arg, 0, sizeof(arg)); -- req->handle = buf->handle; -- req->op = drm_bo_info; -- -- ret = ioctl(fd, DRM_IOCTL_BUFOBJ, &arg); -- -- if (ret) -- return ret; -- if (!arg.handled) -- return -EFAULT; -- if (rep->ret) -- return rep->ret; -- drmBOCopyReply(rep, buf); -- return 0; --} -- --int drmBOWaitIdle(int fd, drmBO *buf, unsigned hint) --{ -- drm_bo_arg_t arg; -- drm_bo_arg_request_t *req = &arg.d.req; -- drm_bo_arg_reply_t *rep = &arg.d.rep; -- int ret = 0; -- -- if ((buf->flags & DRM_BO_FLAG_SHAREABLE) || -- (buf->replyFlags & DRM_BO_REP_BUSY)) { -- memset(&arg, 0, sizeof(arg)); -- req->handle = buf->handle; -- req->op = drm_bo_wait_idle; -- req->hint = hint; -- -- do { -- ret = ioctl(fd, DRM_IOCTL_BUFOBJ, &arg); -- } while (ret && errno == EAGAIN); -- -- if (ret) -- return ret; -- if (!arg.handled) -- return -EFAULT; -- if (rep->ret) -- return rep->ret; -- drmBOCopyReply(rep, buf); -- } -- return 0; --} -- --int drmBOBusy(int fd, drmBO *buf, int *busy) --{ -- if (!(buf->flags & DRM_BO_FLAG_SHAREABLE) && -- !(buf->replyFlags & DRM_BO_REP_BUSY)) { -- *busy = 0; -- return 0; -- } else { -- int ret = drmBOInfo(fd, buf); -- if (ret) -- return ret; -- *busy = (buf->replyFlags & DRM_BO_REP_BUSY); -- return 0; -- } --} -- -- --int drmAddValidateItem(drmBOList *list, drmBO *buf, unsigned flags, -- unsigned mask, -- int *newItem) --{ -- drmBONode *node, *cur; -- drmMMListHead *l; -- -- *newItem = 0; -- cur = NULL; -- -- for (l = list->list.next; l != &list->list; l = l->next) { -- node = DRMLISTENTRY(drmBONode, l, head); -- if (node->buf == buf) { -- cur = node; -- break; -- } -- } -- if (!cur) { -- cur = drmAddListItem(list, buf, flags, mask); -- if (!cur) { -- drmMsg("Out of memory creating validate list node.\n"); -- return -ENOMEM; -- } -- *newItem = 1; -- cur->arg0 = flags; -- cur->arg1 = mask; -- } else { -- unsigned memMask = (cur->arg1 | mask) & DRM_BO_MASK_MEM; -- unsigned memFlags = cur->arg0 & flags & memMask; -- -- if (!memFlags) { -- drmMsg("Incompatible memory location requests " -- "on validate list.\n"); -- drmMsg("Previous flag: 0x%08lx, mask: 0x%08lx\n", -- cur->arg0, cur->arg1); -- drmMsg("Current flag: 0x%08lx, mask: 0x%08lx\n", -- flags, mask); -- return -EINVAL; -- } -- if (mask & cur->arg1 & ~DRM_BO_MASK_MEM & (cur->arg0 ^ flags)) { -- drmMsg("Incompatible buffer flag requests " -- "on validate list.\n"); -- drmMsg("Previous flag: 0x%08lx, mask: 0x%08lx\n", -- cur->arg0, cur->arg1); -- drmMsg("Current flag: 0x%08lx, mask: 0x%08lx\n", -- flags, mask); -- return -EINVAL; -- } -- cur->arg1 |= mask; -- cur->arg0 = memFlags | ((cur->arg0 | flags) & -- cur->arg1 & ~DRM_BO_MASK_MEM); -- } -- return 0; --} -- -- --int drmBOValidateList(int fd, drmBOList *list) --{ -- -- drmBONode *node; -- drmMMListHead *l; -- drm_bo_arg_t *arg, *first; -- drm_bo_arg_request_t *req; -- drm_bo_arg_reply_t *rep; -- drm_u64_t *prevNext = NULL; -- drmBO *buf; -- int ret; -- -- first = NULL; -- -- for (l = list->list.next; l != &list->list; l = l->next) { -- node = DRMLISTENTRY(drmBONode, l, head); -- -- arg = &node->bo_arg; -- req = &arg->d.req; -- -- if (!first) -- first = arg; -- -- if (prevNext) -- *prevNext = (unsigned long) arg; -- -- memset(arg, 0, sizeof(*arg)); -- prevNext = &arg->next; -- req->handle = node->buf->handle; -- req->op = drm_bo_validate; -- req->mask = node->arg0; -- req->hint = 0; -- req->arg_handle = node->arg1; -- } -- -- if (!first) -- return 0; -- -- do{ -- ret = ioctl(fd, DRM_IOCTL_BUFOBJ, first); -- } while (ret && errno == EAGAIN); -- -- -- if (ret) -- return -errno; -- -- for (l = list->list.next; l != &list->list; l = l->next) { -- node = DRMLISTENTRY(drmBONode, l, head); -- arg = &node->bo_arg; -- rep = &arg->d.rep; -- -- if (!arg->handled) { -- drmMsg("Unhandled request\n"); -- return -EFAULT; -- } -- if (rep->ret) -- return rep->ret; -- -- buf = node->buf; -- drmBOCopyReply(rep, buf); -- } -- -- return 0; --} -- -- --int drmBOFenceList(int fd, drmBOList *list, unsigned fenceHandle) --{ -- -- drmBONode *node; -- drmMMListHead *l; -- drm_bo_arg_t *arg, *first; -- drm_bo_arg_request_t *req; -- drm_bo_arg_reply_t *rep; -- drm_u64_t *prevNext = NULL; -- int ret; -- -- first = NULL; -- -- for (l = list->list.next; l != &list->list; l = l->next) { -- node = DRMLISTENTRY(drmBONode, l, head); -- -- arg = &node->bo_arg; -- req = &arg->d.req; -- -- if (!first) -- first = arg; -- -- if (prevNext) -- *prevNext = (unsigned long) arg; -- -- memset(arg, 0, sizeof(*arg)); -- prevNext = &arg->next; -- req->handle = node->buf->handle; -- req->op = drm_bo_fence; -- req->mask = node->arg0; -- req->arg_handle = fenceHandle; -- } -- -- if (!first) -- return 0; -- -- ret = ioctl(fd, DRM_IOCTL_BUFOBJ, first); -- -- if (ret) -- return -errno; -- -- for (l = list->list.next; l != &list->list; l = l->next) { -- node = DRMLISTENTRY(drmBONode, l, head); -- -- arg = &node->bo_arg; -- rep = &arg->d.rep; -- -- if (!arg->handled) -- return -EFAULT; -- if (rep->ret) -- return rep->ret; -- drmBOCopyReply(rep, node->buf); -- } -- -- return 0; --} -- --int drmMMInit(int fd, unsigned long pOffset, unsigned long pSize, -- unsigned memType) --{ -- drm_mm_init_arg_t arg; -- -- memset(&arg, 0, sizeof(arg)); -- arg.req.op = mm_init; -- arg.req.p_offset = pOffset; -- arg.req.p_size = pSize; -- arg.req.mem_type = memType; -- -- if (ioctl(fd, DRM_IOCTL_MM_INIT, &arg)) -- return -errno; -- -- return 0; --} -- --int drmMMTakedown(int fd, unsigned memType) --{ -- drm_mm_init_arg_t arg; -- -- -- memset(&arg, 0, sizeof(arg)); -- arg.req.op = mm_takedown; -- arg.req.mem_type = memType; -- -- if (ioctl(fd, DRM_IOCTL_MM_INIT, &arg)) -- return -errno; -- -- return 0; --} -- --int drmMMLock(int fd, unsigned memType) --{ -- drm_mm_init_arg_t arg; -- int ret; -- -- memset(&arg, 0, sizeof(arg)); -- arg.req.op = mm_lock; -- arg.req.mem_type = memType; -- -- do{ -- ret = ioctl(fd, DRM_IOCTL_MM_INIT, &arg); -- } while (ret && errno == EAGAIN); -- -- return ret; --} -- --int drmMMUnlock(int fd, unsigned memType) --{ -- drm_mm_init_arg_t arg; -- int ret; -- -- memset(&arg, 0, sizeof(arg)); -- arg.req.op = mm_unlock; -- arg.req.mem_type = memType; -- -- do{ -- ret = ioctl(fd, DRM_IOCTL_MM_INIT, &arg); -- } while (ret && errno == EAGAIN); -- -- return ret; --} -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/xf86drmHash.c xorg-server-1.2.99.0/hw/xfree86/os-support/drm/xf86drmHash.c ---- xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/xf86drmHash.c 2006-11-14 10:53:27.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/os-support/drm/xf86drmHash.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,432 +0,0 @@ --/* xf86drmHash.c -- Small hash table support for integer -> integer mapping -- * Created: Sun Apr 18 09:35:45 1999 by faith@precisioninsight.com -- * -- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. -- * All Rights Reserved. -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice (including the next -- * paragraph) shall be included in all copies or substantial portions of the -- * Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -- * DEALINGS IN THE SOFTWARE. -- * -- * Authors: Rickard E. (Rik) Faith -- * -- * -- * DESCRIPTION -- * -- * This file contains a straightforward implementation of a fixed-sized -- * hash table using self-organizing linked lists [Knuth73, pp. 398-399] for -- * collision resolution. There are two potentially interesting things -- * about this implementation: -- * -- * 1) The table is power-of-two sized. Prime sized tables are more -- * traditional, but do not have a significant advantage over power-of-two -- * sized table, especially when double hashing is not used for collision -- * resolution. -- * -- * 2) The hash computation uses a table of random integers [Hanson97, -- * pp. 39-41]. -- * -- * FUTURE ENHANCEMENTS -- * -- * With a table size of 512, the current implementation is sufficient for a -- * few hundred keys. Since this is well above the expected size of the -- * tables for which this implementation was designed, the implementation of -- * dynamic hash tables was postponed until the need arises. A common (and -- * naive) approach to dynamic hash table implementation simply creates a -- * new hash table when necessary, rehashes all the data into the new table, -- * and destroys the old table. The approach in [Larson88] is superior in -- * two ways: 1) only a portion of the table is expanded when needed, -- * distributing the expansion cost over several insertions, and 2) portions -- * of the table can be locked, enabling a scalable thread-safe -- * implementation. -- * -- * REFERENCES -- * -- * [Hanson97] David R. Hanson. C Interfaces and Implementations: -- * Techniques for Creating Reusable Software. Reading, Massachusetts: -- * Addison-Wesley, 1997. -- * -- * [Knuth73] Donald E. Knuth. The Art of Computer Programming. Volume 3: -- * Sorting and Searching. Reading, Massachusetts: Addison-Wesley, 1973. -- * -- * [Larson88] Per-Ake Larson. "Dynamic Hash Tables". CACM 31(4), April -- * 1988, pp. 446-457. -- * -- */ -- --#ifdef HAVE_XORG_CONFIG_H --#include --#endif -- --#define HASH_MAIN 0 -- --#include --#include --#if !HASH_MAIN --# include "drm.h" --# include "xf86drm.h" --# include "xf86.h" --#endif -- --#define N(x) drm##x -- --#define HASH_MAGIC 0xdeadbeef --#define HASH_DEBUG 0 --#define HASH_SIZE 512 /* Good for about 100 entries */ -- /* If you change this value, you probably -- have to change the HashHash hashing -- function! */ -- --#if HASH_MAIN --#define HASH_ALLOC malloc --#define HASH_FREE free --#define HASH_RANDOM_DECL --#define HASH_RANDOM_INIT(seed) srandom(seed) --#define HASH_RANDOM random() --#else --#define HASH_ALLOC drmMalloc --#define HASH_FREE drmFree --#define HASH_RANDOM_DECL void *state --#define HASH_RANDOM_INIT(seed) state = drmRandomCreate(seed) --#define HASH_RANDOM drmRandom(state) -- --#endif -- --typedef struct HashBucket { -- unsigned long key; -- void *value; -- struct HashBucket *next; --} HashBucket, *HashBucketPtr; -- --typedef struct HashTable { -- unsigned long magic; -- unsigned long entries; -- unsigned long hits; /* At top of linked list */ -- unsigned long partials; /* Not at top of linked list */ -- unsigned long misses; /* Not in table */ -- HashBucketPtr buckets[HASH_SIZE]; -- int p0; -- HashBucketPtr p1; --} HashTable, *HashTablePtr; -- --#if HASH_MAIN --extern void *N(HashCreate)(void); --extern int N(HashDestroy)(void *t); --extern int N(HashLookup)(void *t, unsigned long key, unsigned long *value); --extern int N(HashInsert)(void *t, unsigned long key, unsigned long value); --extern int N(HashDelete)(void *t, unsigned long key); --#endif -- --static unsigned long HashHash(unsigned long key) --{ -- unsigned long hash = 0; -- unsigned long tmp = key; -- static int init = 0; -- static unsigned long scatter[256]; -- int i; -- -- if (!init) { -- HASH_RANDOM_DECL; -- HASH_RANDOM_INIT(37); -- for (i = 0; i < 256; i++) scatter[i] = HASH_RANDOM; -- ++init; -- } -- -- while (tmp) { -- hash = (hash << 1) + scatter[tmp & 0xff]; -- tmp >>= 8; -- } -- -- hash %= HASH_SIZE; --#if HASH_DEBUG -- printf( "Hash(%d) = %d\n", key, hash); --#endif -- return hash; --} -- --void *N(HashCreate)(void) --{ -- HashTablePtr table; -- int i; -- -- table = HASH_ALLOC(sizeof(*table)); -- if (!table) return NULL; -- table->magic = HASH_MAGIC; -- table->entries = 0; -- table->hits = 0; -- table->partials = 0; -- table->misses = 0; -- -- for (i = 0; i < HASH_SIZE; i++) table->buckets[i] = NULL; -- return table; --} -- --int N(HashDestroy)(void *t) --{ -- HashTablePtr table = (HashTablePtr)t; -- HashBucketPtr bucket; -- HashBucketPtr next; -- int i; -- -- if (table->magic != HASH_MAGIC) return -1; /* Bad magic */ -- -- for (i = 0; i < HASH_SIZE; i++) { -- for (bucket = table->buckets[i]; bucket;) { -- next = bucket->next; -- HASH_FREE(bucket); -- bucket = next; -- } -- } -- HASH_FREE(table); -- return 0; --} -- --/* Find the bucket and organize the list so that this bucket is at the -- top. */ -- --static HashBucketPtr HashFind(HashTablePtr table, -- unsigned long key, unsigned long *h) --{ -- unsigned long hash = HashHash(key); -- HashBucketPtr prev = NULL; -- HashBucketPtr bucket; -- -- if (h) *h = hash; -- -- for (bucket = table->buckets[hash]; bucket; bucket = bucket->next) { -- if (bucket->key == key) { -- if (prev) { -- /* Organize */ -- prev->next = bucket->next; -- bucket->next = table->buckets[hash]; -- table->buckets[hash] = bucket; -- ++table->partials; -- } else { -- ++table->hits; -- } -- return bucket; -- } -- prev = bucket; -- } -- ++table->misses; -- return NULL; --} -- --int N(HashLookup)(void *t, unsigned long key, void **value) --{ -- HashTablePtr table = (HashTablePtr)t; -- HashBucketPtr bucket; -- -- if (!table || table->magic != HASH_MAGIC) return -1; /* Bad magic */ -- -- bucket = HashFind(table, key, NULL); -- if (!bucket) return 1; /* Not found */ -- *value = bucket->value; -- return 0; /* Found */ --} -- --int N(HashInsert)(void *t, unsigned long key, void *value) --{ -- HashTablePtr table = (HashTablePtr)t; -- HashBucketPtr bucket; -- unsigned long hash; -- -- if (table->magic != HASH_MAGIC) return -1; /* Bad magic */ -- -- if (HashFind(table, key, &hash)) return 1; /* Already in table */ -- -- bucket = HASH_ALLOC(sizeof(*bucket)); -- if (!bucket) return -1; /* Error */ -- bucket->key = key; -- bucket->value = value; -- bucket->next = table->buckets[hash]; -- table->buckets[hash] = bucket; --#if HASH_DEBUG -- printf("Inserted %d at %d/%p\n", key, hash, bucket); --#endif -- return 0; /* Added to table */ --} -- --int N(HashDelete)(void *t, unsigned long key) --{ -- HashTablePtr table = (HashTablePtr)t; -- unsigned long hash; -- HashBucketPtr bucket; -- -- if (table->magic != HASH_MAGIC) return -1; /* Bad magic */ -- -- bucket = HashFind(table, key, &hash); -- -- if (!bucket) return 1; /* Not found */ -- -- table->buckets[hash] = bucket->next; -- HASH_FREE(bucket); -- return 0; --} -- --int N(HashNext)(void *t, unsigned long *key, void **value) --{ -- HashTablePtr table = (HashTablePtr)t; -- -- for (; table->p0 < HASH_SIZE; -- ++table->p0, table->p1 = table->buckets[table->p0]) { -- if (table->p1) { -- *key = table->p1->key; -- *value = table->p1->value; -- table->p1 = table->p1->next; -- return 1; -- } -- } -- return 0; --} -- --int N(HashFirst)(void *t, unsigned long *key, void **value) --{ -- HashTablePtr table = (HashTablePtr)t; -- -- if (table->magic != HASH_MAGIC) return -1; /* Bad magic */ -- -- table->p0 = 0; -- table->p1 = table->buckets[0]; -- return N(HashNext)(table, key, value); --} -- --#if HASH_MAIN --#define DIST_LIMIT 10 --static int dist[DIST_LIMIT]; -- --static void clear_dist(void) { -- int i; -- -- for (i = 0; i < DIST_LIMIT; i++) dist[i] = 0; --} -- --static int count_entries(HashBucketPtr bucket) --{ -- int count = 0; -- -- for (; bucket; bucket = bucket->next) ++count; -- return count; --} -- --static void update_dist(int count) --{ -- if (count >= DIST_LIMIT) ++dist[DIST_LIMIT-1]; -- else ++dist[count]; --} -- --static void compute_dist(HashTablePtr table) --{ -- int i; -- HashBucketPtr bucket; -- -- printf("Entries = %ld, hits = %ld, partials = %ld, misses = %ld\n", -- table->entries, table->hits, table->partials, table->misses); -- clear_dist(); -- for (i = 0; i < HASH_SIZE; i++) { -- bucket = table->buckets[i]; -- update_dist(count_entries(bucket)); -- } -- for (i = 0; i < DIST_LIMIT; i++) { -- if (i != DIST_LIMIT-1) printf("%5d %10d\n", i, dist[i]); -- else printf("other %10d\n", dist[i]); -- } --} -- --static void check_table(HashTablePtr table, -- unsigned long key, unsigned long value) --{ -- unsigned long retval = 0; -- int retcode = N(HashLookup)(table, key, &retval); -- -- switch (retcode) { -- case -1: -- printf("Bad magic = 0x%08lx:" -- " key = %lu, expected = %lu, returned = %lu\n", -- table->magic, key, value, retval); -- break; -- case 1: -- printf("Not found: key = %lu, expected = %lu returned = %lu\n", -- key, value, retval); -- break; -- case 0: -- if (value != retval) -- printf("Bad value: key = %lu, expected = %lu, returned = %lu\n", -- key, value, retval); -- break; -- default: -- printf("Bad retcode = %d: key = %lu, expected = %lu, returned = %lu\n", -- retcode, key, value, retval); -- break; -- } --} -- --int main(void) --{ -- HashTablePtr table; -- int i; -- -- printf("\n***** 256 consecutive integers ****\n"); -- table = N(HashCreate)(); -- for (i = 0; i < 256; i++) N(HashInsert)(table, i, i); -- for (i = 0; i < 256; i++) check_table(table, i, i); -- for (i = 256; i >= 0; i--) check_table(table, i, i); -- compute_dist(table); -- N(HashDestroy)(table); -- -- printf("\n***** 1024 consecutive integers ****\n"); -- table = N(HashCreate)(); -- for (i = 0; i < 1024; i++) N(HashInsert)(table, i, i); -- for (i = 0; i < 1024; i++) check_table(table, i, i); -- for (i = 1024; i >= 0; i--) check_table(table, i, i); -- compute_dist(table); -- N(HashDestroy)(table); -- -- printf("\n***** 1024 consecutive page addresses (4k pages) ****\n"); -- table = N(HashCreate)(); -- for (i = 0; i < 1024; i++) N(HashInsert)(table, i*4096, i); -- for (i = 0; i < 1024; i++) check_table(table, i*4096, i); -- for (i = 1024; i >= 0; i--) check_table(table, i*4096, i); -- compute_dist(table); -- N(HashDestroy)(table); -- -- printf("\n***** 1024 random integers ****\n"); -- table = N(HashCreate)(); -- srandom(0xbeefbeef); -- for (i = 0; i < 1024; i++) N(HashInsert)(table, random(), i); -- srandom(0xbeefbeef); -- for (i = 0; i < 1024; i++) check_table(table, random(), i); -- srandom(0xbeefbeef); -- for (i = 0; i < 1024; i++) check_table(table, random(), i); -- compute_dist(table); -- N(HashDestroy)(table); -- -- printf("\n***** 5000 random integers ****\n"); -- table = N(HashCreate)(); -- srandom(0xbeefbeef); -- for (i = 0; i < 5000; i++) N(HashInsert)(table, random(), i); -- srandom(0xbeefbeef); -- for (i = 0; i < 5000; i++) check_table(table, random(), i); -- srandom(0xbeefbeef); -- for (i = 0; i < 5000; i++) check_table(table, random(), i); -- compute_dist(table); -- N(HashDestroy)(table); -- -- return 0; --} --#endif -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/xf86drmRandom.c xorg-server-1.2.99.0/hw/xfree86/os-support/drm/xf86drmRandom.c ---- xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/xf86drmRandom.c 2006-11-14 10:53:27.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/os-support/drm/xf86drmRandom.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,216 +0,0 @@ --/* xf86drmRandom.c -- "Minimal Standard" PRNG Implementation -- * Created: Mon Apr 19 08:28:13 1999 by faith@precisioninsight.com -- * -- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. -- * All Rights Reserved. -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice (including the next -- * paragraph) shall be included in all copies or substantial portions of the -- * Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -- * DEALINGS IN THE SOFTWARE. -- * -- * Authors: Rickard E. (Rik) Faith -- * -- * -- * DESCRIPTION -- * -- * This file contains a simple, straightforward implementation of the Park -- * & Miller "Minimal Standard" PRNG [PM88, PMS93], which is a Lehmer -- * multiplicative linear congruential generator (MLCG) with a period of -- * 2^31-1. -- * -- * This implementation is intended to provide a reliable, portable PRNG -- * that is suitable for testing a hash table implementation and for -- * implementing skip lists. -- * -- * FUTURE ENHANCEMENTS -- * -- * If initial seeds are not selected randomly, two instances of the PRNG -- * can be correlated. [Knuth81, pp. 32-33] describes a shuffling technique -- * that can eliminate this problem. -- * -- * If PRNGs are used for simulation, the period of the current -- * implementation may be too short. [LE88] discusses methods of combining -- * MLCGs to produce much longer periods, and suggests some alternative -- * values for A and M. [LE90 and Sch92] also provide information on -- * long-period PRNGs. -- * -- * REFERENCES -- * -- * [Knuth81] Donald E. Knuth. The Art of Computer Programming. Volume 2: -- * Seminumerical Algorithms. Reading, Massachusetts: Addison-Wesley, 1981. -- * -- * [LE88] Pierre L'Ecuyer. "Efficient and Portable Combined Random Number -- * Generators". CACM 31(6), June 1988, pp. 742-774. -- * -- * [LE90] Pierre L'Ecuyer. "Random Numbers for Simulation". CACM 33(10, -- * October 1990, pp. 85-97. -- * -- * [PM88] Stephen K. Park and Keith W. Miller. "Random Number Generators: -- * Good Ones are Hard to Find". CACM 31(10), October 1988, pp. 1192-1201. -- * -- * [Sch92] Bruce Schneier. "Pseudo-Ransom Sequence Generator for 32-Bit -- * CPUs". Dr. Dobb's Journal 17(2), February 1992, pp. 34, 37-38, 40. -- * -- * [PMS93] Stephen K. Park, Keith W. Miller, and Paul K. Stockmeyer. In -- * "Technical Correspondence: Remarks on Choosing and Implementing Random -- * Number Generators". CACM 36(7), July 1993, pp. 105-110. -- * -- */ -- --#ifdef HAVE_XORG_CONFIG_H --#include --#endif -- --#define RANDOM_MAIN 0 -- --#include --#include --#if !RANDOM_MAIN --# include "drm.h" --# include "xf86drm.h" --# include "xf86.h" --#endif -- --#define N(x) drm##x -- --#define RANDOM_MAGIC 0xfeedbeef --#define RANDOM_DEBUG 0 -- --#if RANDOM_MAIN --#define RANDOM_ALLOC malloc --#define RANDOM_FREE free --#else --#define RANDOM_ALLOC drmMalloc --#define RANDOM_FREE drmFree --#endif -- --typedef struct RandomState { -- unsigned long magic; -- unsigned long a; -- unsigned long m; -- unsigned long q; /* m div a */ -- unsigned long r; /* m mod a */ -- unsigned long check; -- long seed; --} RandomState; -- --#if RANDOM_MAIN --extern void *N(RandomCreate)(unsigned long seed); --extern int N(RandomDestroy)(void *state); --extern unsigned long N(Random)(void *state); --extern double N(RandomDouble)(void *state); --#endif -- --void *N(RandomCreate)(unsigned long seed) --{ -- RandomState *state; -- -- state = RANDOM_ALLOC(sizeof(*state)); -- if (!state) return NULL; -- state->magic = RANDOM_MAGIC; --#if 0 -- /* Park & Miller, October 1988 */ -- state->a = 16807; -- state->m = 2147483647; -- state->check = 1043618065; /* After 10000 iterations */ --#else -- /* Park, Miller, and Stockmeyer, July 1993 */ -- state->a = 48271; -- state->m = 2147483647; -- state->check = 399268537; /* After 10000 iterations */ --#endif -- state->q = state->m / state->a; -- state->r = state->m % state->a; -- -- state->seed = seed; -- /* Check for illegal boundary conditions, -- and choose closest legal value. */ -- if (state->seed <= 0) state->seed = 1; -- if (state->seed >= state->m) state->seed = state->m - 1; -- -- return state; --} -- --int N(RandomDestroy)(void *state) --{ -- RANDOM_FREE(state); -- return 0; --} -- --unsigned long N(Random)(void *state) --{ -- RandomState *s = (RandomState *)state; -- long hi; -- long lo; -- -- hi = s->seed / s->q; -- lo = s->seed % s->q; -- s->seed = s->a * lo - s->r * hi; -- if (s->seed <= 0) s->seed += s->m; -- -- return s->seed; --} -- --double N(RandomDouble)(void *state) --{ -- RandomState *s = (RandomState *)state; -- -- return (double)N(Random)(state)/(double)s->m; --} -- --#if RANDOM_MAIN --static void check_period(long seed) --{ -- unsigned long count = 0; -- unsigned long initial; -- void *state; -- -- state = N(RandomCreate)(seed); -- initial = N(Random)(state); -- ++count; -- while (initial != N(Random)(state)) { -- if (!++count) break; -- } -- printf("With seed of %10ld, period = %10lu (0x%08lx)\n", -- seed, count, count); -- N(RandomDestroy)(state); --} -- --int main(void) --{ -- RandomState *state; -- int i; -- unsigned long rand; -- -- state = N(RandomCreate)(1); -- for (i = 0; i < 10000; i++) { -- rand = N(Random)(state); -- } -- printf("After 10000 iterations: %lu (%lu expected): %s\n", -- rand, state->check, -- rand - state->check ? "*INCORRECT*" : "CORRECT"); -- N(RandomDestroy)(state); -- -- printf("Checking periods...\n"); -- check_period(1); -- check_period(2); -- check_period(31415926); -- -- return 0; --} --#endif -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/xf86drmSL.c xorg-server-1.2.99.0/hw/xfree86/os-support/drm/xf86drmSL.c ---- xorg-server-1.2.99.0.orig/hw/xfree86/os-support/drm/xf86drmSL.c 2006-11-14 10:53:27.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/os-support/drm/xf86drmSL.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,488 +0,0 @@ --/* xf86drmSL.c -- Skip list support -- * Created: Mon May 10 09:28:13 1999 by faith@precisioninsight.com -- * -- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. -- * All Rights Reserved. -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice (including the next -- * paragraph) shall be included in all copies or substantial portions of the -- * Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -- * DEALINGS IN THE SOFTWARE. -- * -- * Authors: Rickard E. (Rik) Faith -- * -- * -- * DESCRIPTION -- * -- * This file contains a straightforward skip list implementation.n -- * -- * FUTURE ENHANCEMENTS -- * -- * REFERENCES -- * -- * [Pugh90] William Pugh. Skip Lists: A Probabilistic Alternative to -- * Balanced Trees. CACM 33(6), June 1990, pp. 668-676. -- * -- */ -- --#ifdef HAVE_XORG_CONFIG_H --#include --#endif -- --#define SL_MAIN 0 -- --#if SL_MAIN --# include --# include --# include --#else --# include "drm.h" --# include "xf86drm.h" --# include "xf86.h" --#endif -- --#define N(x) drm##x -- --#define SL_LIST_MAGIC 0xfacade00LU --#define SL_ENTRY_MAGIC 0x00fab1edLU --#define SL_FREED_MAGIC 0xdecea5edLU --#define SL_MAX_LEVEL 16 --#define SL_DEBUG 0 --#define SL_RANDOM_SEED 0xc01055a1LU -- --#if SL_MAIN --#define SL_ALLOC malloc --#define SL_FREE free --#define SL_RANDOM_DECL static int state = 0; --#define SL_RANDOM_INIT(seed) if (!state) { srandom(seed); ++state; } --#define SL_RANDOM random() --#else --#define SL_ALLOC drmMalloc --#define SL_FREE drmFree --#define SL_RANDOM_DECL static void *state = NULL --#define SL_RANDOM_INIT(seed) if (!state) state = drmRandomCreate(seed) --#define SL_RANDOM drmRandom(state) -- --#endif -- --typedef struct SLEntry { -- unsigned long magic; /* SL_ENTRY_MAGIC */ -- unsigned long key; -- void *value; -- int levels; -- struct SLEntry *forward[1]; /* variable sized array */ --} SLEntry, *SLEntryPtr; -- --typedef struct SkipList { -- unsigned long magic; /* SL_LIST_MAGIC */ -- int level; -- int count; -- SLEntryPtr head; -- SLEntryPtr p0; /* Position for iteration */ --} SkipList, *SkipListPtr; -- --#if SL_MAIN --extern void *N(SLCreate)(void); --extern int N(SLDestroy)(void *l); --extern int N(SLLookup)(void *l, unsigned long key, void **value); --extern int N(SLInsert)(void *l, unsigned long key, void *value); --extern int N(SLDelete)(void *l, unsigned long key); --extern int N(SLNext)(void *l, unsigned long *key, void **value); --extern int N(SLFirst)(void *l, unsigned long *key, void **value); --extern void N(SLDump)(void *l); --extern int N(SLLookupNeighbors)(void *l, unsigned long key, -- unsigned long *prev_key, void **prev_value, -- unsigned long *next_key, void **next_value); --#endif -- --static SLEntryPtr SLCreateEntry(int max_level, unsigned long key, void *value) --{ -- SLEntryPtr entry; -- -- if (max_level < 0 || max_level > SL_MAX_LEVEL) max_level = SL_MAX_LEVEL; -- -- entry = SL_ALLOC(sizeof(*entry) -- + (max_level + 1) * sizeof(entry->forward[0])); -- if (!entry) return NULL; -- entry->magic = SL_ENTRY_MAGIC; -- entry->key = key; -- entry->value = value; -- entry->levels = max_level + 1; -- -- return entry; --} -- --static int SLRandomLevel(void) --{ -- int level = 1; -- SL_RANDOM_DECL; -- -- SL_RANDOM_INIT(SL_RANDOM_SEED); -- -- while ((SL_RANDOM & 0x01) && level < SL_MAX_LEVEL) ++level; -- return level; --} -- --void *N(SLCreate)(void) --{ -- SkipListPtr list; -- int i; -- -- list = SL_ALLOC(sizeof(*list)); -- if (!list) return NULL; -- list->magic = SL_LIST_MAGIC; -- list->level = 0; -- list->head = SLCreateEntry(SL_MAX_LEVEL, 0, NULL); -- list->count = 0; -- -- for (i = 0; i <= SL_MAX_LEVEL; i++) list->head->forward[i] = NULL; -- -- return list; --} -- --int N(SLDestroy)(void *l) --{ -- SkipListPtr list = (SkipListPtr)l; -- SLEntryPtr entry; -- SLEntryPtr next; -- -- if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */ -- -- for (entry = list->head; entry; entry = next) { -- if (entry->magic != SL_ENTRY_MAGIC) return -1; /* Bad magic */ -- next = entry->forward[0]; -- entry->magic = SL_FREED_MAGIC; -- SL_FREE(entry); -- } -- -- list->magic = SL_FREED_MAGIC; -- SL_FREE(list); -- return 0; --} -- --static SLEntryPtr SLLocate(void *l, unsigned long key, SLEntryPtr *update) --{ -- SkipListPtr list = (SkipListPtr)l; -- SLEntryPtr entry; -- int i; -- -- if (list->magic != SL_LIST_MAGIC) return NULL; -- -- for (i = list->level, entry = list->head; i >= 0; i--) { -- while (entry->forward[i] && entry->forward[i]->key < key) -- entry = entry->forward[i]; -- update[i] = entry; -- } -- -- return entry->forward[0]; --} -- --int N(SLInsert)(void *l, unsigned long key, void *value) --{ -- SkipListPtr list = (SkipListPtr)l; -- SLEntryPtr entry; -- SLEntryPtr update[SL_MAX_LEVEL + 1]; -- int level; -- int i; -- -- if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */ -- -- entry = SLLocate(list, key, update); -- -- if (entry && entry->key == key) return 1; /* Already in list */ -- -- -- level = SLRandomLevel(); -- if (level > list->level) { -- level = ++list->level; -- update[level] = list->head; -- } -- -- entry = SLCreateEntry(level, key, value); -- -- /* Fix up forward pointers */ -- for (i = 0; i <= level; i++) { -- entry->forward[i] = update[i]->forward[i]; -- update[i]->forward[i] = entry; -- } -- -- ++list->count; -- return 0; /* Added to table */ --} -- --int N(SLDelete)(void *l, unsigned long key) --{ -- SkipListPtr list = (SkipListPtr)l; -- SLEntryPtr update[SL_MAX_LEVEL + 1]; -- SLEntryPtr entry; -- int i; -- -- if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */ -- -- entry = SLLocate(list, key, update); -- -- if (!entry || entry->key != key) return 1; /* Not found */ -- -- /* Fix up forward pointers */ -- for (i = 0; i <= list->level; i++) { -- if (update[i]->forward[i] == entry) -- update[i]->forward[i] = entry->forward[i]; -- } -- -- entry->magic = SL_FREED_MAGIC; -- SL_FREE(entry); -- -- while (list->level && !list->head->forward[list->level]) --list->level; -- --list->count; -- return 0; --} -- --int N(SLLookup)(void *l, unsigned long key, void **value) --{ -- SkipListPtr list = (SkipListPtr)l; -- SLEntryPtr update[SL_MAX_LEVEL + 1]; -- SLEntryPtr entry; -- -- entry = SLLocate(list, key, update); -- -- if (entry && entry->key == key) { -- *value = entry; -- return 0; -- } -- *value = NULL; -- return -1; --} -- --int N(SLLookupNeighbors)(void *l, unsigned long key, -- unsigned long *prev_key, void **prev_value, -- unsigned long *next_key, void **next_value) --{ -- SkipListPtr list = (SkipListPtr)l; -- SLEntryPtr update[SL_MAX_LEVEL + 1]; -- SLEntryPtr entry; -- int retcode = 0; -- -- entry = SLLocate(list, key, update); -- -- *prev_key = *next_key = key; -- *prev_value = *next_value = NULL; -- -- if (update[0]) { -- *prev_key = update[0]->key; -- *prev_value = update[0]->value; -- ++retcode; -- if (update[0]->forward[0]) { -- *next_key = update[0]->forward[0]->key; -- *next_value = update[0]->forward[0]->value; -- ++retcode; -- } -- } -- return retcode; --} -- --int N(SLNext)(void *l, unsigned long *key, void **value) --{ -- SkipListPtr list = (SkipListPtr)l; -- SLEntryPtr entry; -- -- if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */ -- -- entry = list->p0; -- -- if (entry) { -- list->p0 = entry->forward[0]; -- *key = entry->key; -- *value = entry->value; -- return 1; -- } -- list->p0 = NULL; -- return 0; --} -- --int N(SLFirst)(void *l, unsigned long *key, void **value) --{ -- SkipListPtr list = (SkipListPtr)l; -- -- if (list->magic != SL_LIST_MAGIC) return -1; /* Bad magic */ -- -- list->p0 = list->head->forward[0]; -- return N(SLNext)(list, key, value); --} -- --/* Dump internal data structures for debugging. */ --void N(SLDump)(void *l) --{ -- SkipListPtr list = (SkipListPtr)l; -- SLEntryPtr entry; -- int i; -- -- if (list->magic != SL_LIST_MAGIC) { -- printf("Bad magic: 0x%08lx (expected 0x%08lx)\n", -- list->magic, SL_LIST_MAGIC); -- return; -- } -- -- printf("Level = %d, count = %d\n", list->level, list->count); -- for (entry = list->head; entry; entry = entry->forward[0]) { -- if (entry->magic != SL_ENTRY_MAGIC) { -- printf("Bad magic: 0x%08lx (expected 0x%08lx)\n", -- list->magic, SL_ENTRY_MAGIC); -- } -- printf("\nEntry %p <0x%08lx, %p> has %2d levels\n", -- entry, entry->key, entry->value, entry->levels); -- for (i = 0; i < entry->levels; i++) { -- if (entry->forward[i]) { -- printf(" %2d: %p <0x%08lx, %p>\n", -- i, -- entry->forward[i], -- entry->forward[i]->key, -- entry->forward[i]->value); -- } else { -- printf(" %2d: %p\n", i, entry->forward[i]); -- } -- } -- } --} -- --#if SL_MAIN --static void print(SkipListPtr list) --{ -- unsigned long key; -- void *value; -- -- if (N(SLFirst)(list, &key, &value)) { -- do { -- printf("key = %5lu, value = %p\n", key, value); -- } while (N(SLNext)(list, &key, &value)); -- } --} -- --static double do_time(int size, int iter) --{ -- SkipListPtr list; -- int i, j; -- unsigned long keys[1000000]; -- unsigned long previous; -- unsigned long key; -- void *value; -- struct timeval start, stop; -- double usec; -- SL_RANDOM_DECL; -- -- SL_RANDOM_INIT(12345); -- -- list = N(SLCreate)(); -- -- for (i = 0; i < size; i++) { -- keys[i] = SL_RANDOM; -- N(SLInsert)(list, keys[i], NULL); -- } -- -- previous = 0; -- if (N(SLFirst)(list, &key, &value)) { -- do { -- if (key <= previous) { -- printf( "%lu !< %lu\n", previous, key); -- } -- previous = key; -- } while (N(SLNext)(list, &key, &value)); -- } -- -- gettimeofday(&start, NULL); -- for (j = 0; j < iter; j++) { -- for (i = 0; i < size; i++) { -- if (N(SLLookup)(list, keys[i], &value)) -- printf("Error %lu %d\n", keys[i], i); -- } -- } -- gettimeofday(&stop, NULL); -- -- usec = (double)(stop.tv_sec * 1000000 + stop.tv_usec -- - start.tv_sec * 1000000 - start.tv_usec) / (size * iter); -- -- printf("%0.2f microseconds for list length %d\n", usec, size); -- -- N(SLDestroy)(list); -- -- return usec; --} -- --static void print_neighbors(void *list, unsigned long key) --{ -- unsigned long prev_key = 0; -- unsigned long next_key = 0; -- void *prev_value; -- void *next_value; -- int retval; -- -- retval = drmSLLookupNeighbors(list, key, -- &prev_key, &prev_value, -- &next_key, &next_value); -- printf("Neighbors of %5lu: %d %5lu %5lu\n", -- key, retval, prev_key, next_key); --} -- --int main(void) --{ -- SkipListPtr list; -- double usec, usec2, usec3, usec4; -- -- list = N(SLCreate)(); -- printf( "list at %p\n", list); -- -- print(list); -- printf("\n==============================\n\n"); -- -- N(SLInsert)(list, 123, NULL); -- N(SLInsert)(list, 213, NULL); -- N(SLInsert)(list, 50, NULL); -- print(list); -- printf("\n==============================\n\n"); -- -- print_neighbors(list, 0); -- print_neighbors(list, 50); -- print_neighbors(list, 51); -- print_neighbors(list, 123); -- print_neighbors(list, 200); -- print_neighbors(list, 213); -- print_neighbors(list, 256); -- printf("\n==============================\n\n"); -- -- N(SLDelete)(list, 50); -- print(list); -- printf("\n==============================\n\n"); -- -- N(SLDump)(list); -- N(SLDestroy)(list); -- printf("\n==============================\n\n"); -- -- usec = do_time(100, 10000); -- usec2 = do_time(1000, 500); -- printf("Table size increased by %0.2f, search time increased by %0.2f\n", -- 1000.0/100.0, usec2 / usec); -- -- usec3 = do_time(10000, 50); -- printf("Table size increased by %0.2f, search time increased by %0.2f\n", -- 10000.0/100.0, usec3 / usec); -- -- usec4 = do_time(100000, 4); -- printf("Table size increased by %0.2f, search time increased by %0.2f\n", -- 100000.0/100.0, usec4 / usec); -- -- return 0; --} --#endif -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/os-support/Makefile.am xorg-server-1.2.99.0/hw/xfree86/os-support/Makefile.am ---- xorg-server-1.2.99.0.orig/hw/xfree86/os-support/Makefile.am 2006-11-14 10:53:27.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/os-support/Makefile.am 2006-11-14 11:03:07.000000000 +0100 -@@ -1,14 +1,10 @@ --if DRI --DRI_SUBDIRS=drm --endif -- - SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS) --DIST_SUBDIRS = bsd bus drm misc linux lynxos solaris sysv sco usl hurd -+DIST_SUBDIRS = bsd bus misc linux lynxos solaris sysv sco usl hurd - - sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h \ - assyntax.h xf86OSmouse.h - --EXTRA_DIST = int10Defines.h xf86OSpriv.h README.OS-lib xf86drm.h -+EXTRA_DIST = int10Defines.h xf86OSpriv.h README.OS-lib - - # to get the grouping semantics right, you have to glom these three together - # as one library, otherwise libtool will actively defeat your attempts to -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/os-support/xf86drm.h xorg-server-1.2.99.0/hw/xfree86/os-support/xf86drm.h ---- xorg-server-1.2.99.0.orig/hw/xfree86/os-support/xf86drm.h 2006-11-14 10:53:27.000000000 +0100 -+++ xorg-server-1.2.99.0/hw/xfree86/os-support/xf86drm.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,641 +0,0 @@ --/** -- * \file xf86drm.h -- * OS-independent header for DRM user-level library interface. -- * -- * \author Rickard E. (Rik) Faith -- */ -- --/* -- * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. -- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. -- * All Rights Reserved. -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice (including the next -- * paragraph) shall be included in all copies or substantial portions of the -- * Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -- * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -- * DEALINGS IN THE SOFTWARE. -- * -- */ -- -- --#ifndef _XF86DRM_H_ --#define _XF86DRM_H_ -- --#include --#include -- -- /* Defaults, if nothing set in xf86config */ --#define DRM_DEV_UID 0 --#define DRM_DEV_GID 0 --/* Default /dev/dri directory permissions 0755 */ --#define DRM_DEV_DIRMODE \ -- (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) --#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) -- --#define DRM_DIR_NAME "/dev/dri" --#define DRM_DEV_NAME "%s/card%d" --#define DRM_PROC_NAME "/proc/dri/" /* For backward Linux compatibility */ -- --#define DRM_ERR_NO_DEVICE (-1001) --#define DRM_ERR_NO_ACCESS (-1002) --#define DRM_ERR_NOT_ROOT (-1003) --#define DRM_ERR_INVALID (-1004) --#define DRM_ERR_NO_FD (-1005) -- --#define DRM_AGP_NO_HANDLE 0 -- --typedef unsigned int drmSize, *drmSizePtr; /**< For mapped regions */ --typedef void *drmAddress, **drmAddressPtr; /**< For mapped regions */ -- --/** -- * Driver version information. -- * -- * \sa drmGetVersion() and drmSetVersion(). -- */ --typedef struct _drmVersion { -- int version_major; /**< Major version */ -- int version_minor; /**< Minor version */ -- int version_patchlevel; /**< Patch level */ -- int name_len; /**< Length of name buffer */ -- char *name; /**< Name of driver */ -- int date_len; /**< Length of date buffer */ -- char *date; /**< User-space buffer to hold date */ -- int desc_len; /**< Length of desc buffer */ -- char *desc; /**< User-space buffer to hold desc */ --} drmVersion, *drmVersionPtr; -- --typedef struct _drmStats { -- unsigned long count; /**< Number of data */ -- struct { -- unsigned long value; /**< Value from kernel */ -- const char *long_format; /**< Suggested format for long_name */ -- const char *long_name; /**< Long name for value */ -- const char *rate_format; /**< Suggested format for rate_name */ -- const char *rate_name; /**< Short name for value per second */ -- int isvalue; /**< True if value (vs. counter) */ -- const char *mult_names; /**< Multiplier names (e.g., "KGM") */ -- int mult; /**< Multiplier value (e.g., 1024) */ -- int verbose; /**< Suggest only in verbose output */ -- } data[15]; --} drmStatsT; -- -- -- /* All of these enums *MUST* match with the -- kernel implementation -- so do *NOT* -- change them! (The drmlib implementation -- will just copy the flags instead of -- translating them.) */ --typedef enum { -- DRM_FRAME_BUFFER = 0, /**< WC, no caching, no core dump */ -- DRM_REGISTERS = 1, /**< no caching, no core dump */ -- DRM_SHM = 2, /**< shared, cached */ -- DRM_AGP = 3, /**< AGP/GART */ -- DRM_SCATTER_GATHER = 4, /**< PCI scatter/gather */ -- DRM_CONSISTENT = 5 /**< PCI consistent */ --} drmMapType; -- --typedef enum { -- DRM_RESTRICTED = 0x0001, /**< Cannot be mapped to client-virtual */ -- DRM_READ_ONLY = 0x0002, /**< Read-only in client-virtual */ -- DRM_LOCKED = 0x0004, /**< Physical pages locked */ -- DRM_KERNEL = 0x0008, /**< Kernel requires access */ -- DRM_WRITE_COMBINING = 0x0010, /**< Use write-combining, if available */ -- DRM_CONTAINS_LOCK = 0x0020, /**< SHM page that contains lock */ -- DRM_REMOVABLE = 0x0040 /**< Removable mapping */ --} drmMapFlags; -- --/** -- * \warning These values *MUST* match drm.h -- */ --typedef enum { -- /** \name Flags for DMA buffer dispatch */ -- /*@{*/ -- DRM_DMA_BLOCK = 0x01, /**< -- * Block until buffer dispatched. -- * -- * \note the buffer may not yet have been -- * processed by the hardware -- getting a -- * hardware lock with the hardware quiescent -- * will ensure that the buffer has been -- * processed. -- */ -- DRM_DMA_WHILE_LOCKED = 0x02, /**< Dispatch while lock held */ -- DRM_DMA_PRIORITY = 0x04, /**< High priority dispatch */ -- /*@}*/ -- -- /** \name Flags for DMA buffer request */ -- /*@{*/ -- DRM_DMA_WAIT = 0x10, /**< Wait for free buffers */ -- DRM_DMA_SMALLER_OK = 0x20, /**< Smaller-than-requested buffers OK */ -- DRM_DMA_LARGER_OK = 0x40 /**< Larger-than-requested buffers OK */ -- /*@}*/ --} drmDMAFlags; -- --typedef enum { -- DRM_PAGE_ALIGN = 0x01, -- DRM_AGP_BUFFER = 0x02, -- DRM_SG_BUFFER = 0x04, -- DRM_FB_BUFFER = 0x08 --} drmBufDescFlags; -- --typedef enum { -- DRM_LOCK_READY = 0x01, /**< Wait until hardware is ready for DMA */ -- DRM_LOCK_QUIESCENT = 0x02, /**< Wait until hardware quiescent */ -- DRM_LOCK_FLUSH = 0x04, /**< Flush this context's DMA queue first */ -- DRM_LOCK_FLUSH_ALL = 0x08, /**< Flush all DMA queues first */ -- /* These *HALT* flags aren't supported yet -- -- they will be used to support the -- full-screen DGA-like mode. */ -- DRM_HALT_ALL_QUEUES = 0x10, /**< Halt all current and future queues */ -- DRM_HALT_CUR_QUEUES = 0x20 /**< Halt all current queues */ --} drmLockFlags; -- --typedef enum { -- DRM_CONTEXT_PRESERVED = 0x01, /**< This context is preserved and -- never swapped. */ -- DRM_CONTEXT_2DONLY = 0x02 /**< This context is for 2D rendering only. */ --} drm_context_tFlags, *drm_context_tFlagsPtr; -- --typedef struct _drmBufDesc { -- int count; /**< Number of buffers of this size */ -- int size; /**< Size in bytes */ -- int low_mark; /**< Low water mark */ -- int high_mark; /**< High water mark */ --} drmBufDesc, *drmBufDescPtr; -- --typedef struct _drmBufInfo { -- int count; /**< Number of buffers described in list */ -- drmBufDescPtr list; /**< List of buffer descriptions */ --} drmBufInfo, *drmBufInfoPtr; -- --typedef struct _drmBuf { -- int idx; /**< Index into the master buffer list */ -- int total; /**< Buffer size */ -- int used; /**< Amount of buffer in use (for DMA) */ -- drmAddress address; /**< Address */ --} drmBuf, *drmBufPtr; -- --/** -- * Buffer mapping information. -- * -- * Used by drmMapBufs() and drmUnmapBufs() to store information about the -- * mapped buffers. -- */ --typedef struct _drmBufMap { -- int count; /**< Number of buffers mapped */ -- drmBufPtr list; /**< Buffers */ --} drmBufMap, *drmBufMapPtr; -- --typedef struct _drmLock { -- volatile unsigned int lock; -- char padding[60]; -- /* This is big enough for most current (and future?) architectures: -- DEC Alpha: 32 bytes -- Intel Merced: ? -- Intel P5/PPro/PII/PIII: 32 bytes -- Intel StrongARM: 32 bytes -- Intel i386/i486: 16 bytes -- MIPS: 32 bytes (?) -- Motorola 68k: 16 bytes -- Motorola PowerPC: 32 bytes -- Sun SPARC: 32 bytes -- */ --} drmLock, *drmLockPtr; -- --/** -- * Indices here refer to the offset into -- * list in drmBufInfo -- */ --typedef struct _drmDMAReq { -- drm_context_t context; /**< Context handle */ -- int send_count; /**< Number of buffers to send */ -- int *send_list; /**< List of handles to buffers */ -- int *send_sizes; /**< Lengths of data to send, in bytes */ -- drmDMAFlags flags; /**< Flags */ -- int request_count; /**< Number of buffers requested */ -- int request_size; /**< Desired size of buffers requested */ -- int *request_list; /**< Buffer information */ -- int *request_sizes; /**< Minimum acceptable sizes */ -- int granted_count; /**< Number of buffers granted at this size */ --} drmDMAReq, *drmDMAReqPtr; -- --typedef struct _drmRegion { -- drm_handle_t handle; -- unsigned int offset; -- drmSize size; -- drmAddress map; --} drmRegion, *drmRegionPtr; -- --typedef struct _drmTextureRegion { -- unsigned char next; -- unsigned char prev; -- unsigned char in_use; -- unsigned char padding; /**< Explicitly pad this out */ -- unsigned int age; --} drmTextureRegion, *drmTextureRegionPtr; -- -- --typedef enum { -- DRM_VBLANK_ABSOLUTE = 0x0, /**< Wait for specific vblank sequence number */ -- DRM_VBLANK_RELATIVE = 0x1, /**< Wait for given number of vblanks */ -- DRM_VBLANK_SIGNAL = 0x40000000 /* Send signal instead of blocking */ --} drmVBlankSeqType; -- --typedef struct _drmVBlankReq { -- drmVBlankSeqType type; -- unsigned int sequence; -- unsigned long signal; --} drmVBlankReq, *drmVBlankReqPtr; -- --typedef struct _drmVBlankReply { -- drmVBlankSeqType type; -- unsigned int sequence; -- long tval_sec; -- long tval_usec; --} drmVBlankReply, *drmVBlankReplyPtr; -- --typedef union _drmVBlank { -- drmVBlankReq request; -- drmVBlankReply reply; --} drmVBlank, *drmVBlankPtr; -- --typedef struct _drmSetVersion { -- int drm_di_major; -- int drm_di_minor; -- int drm_dd_major; -- int drm_dd_minor; --} drmSetVersion, *drmSetVersionPtr; -- -- --#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock) -- --#define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ --#define DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */ -- --#if defined(__GNUC__) && (__GNUC__ >= 2) --# if defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) -- /* Reflect changes here to drmP.h */ --#define DRM_CAS(lock,old,new,__ret) \ -- do { \ -- int __dummy; /* Can't mark eax as clobbered */ \ -- __asm__ __volatile__( \ -- "lock ; cmpxchg %4,%1\n\t" \ -- "setnz %0" \ -- : "=d" (__ret), \ -- "=m" (__drm_dummy_lock(lock)), \ -- "=a" (__dummy) \ -- : "2" (old), \ -- "r" (new)); \ -- } while (0) -- --#elif defined(__alpha__) -- --#define DRM_CAS(lock, old, new, ret) \ -- do { \ -- int old32; \ -- int cur32; \ -- __asm__ __volatile__( \ -- " mb\n" \ -- " zap %4, 0xF0, %0\n" \ -- " ldl_l %1, %2\n" \ -- " zap %1, 0xF0, %1\n" \ -- " cmpeq %0, %1, %1\n" \ -- " beq %1, 1f\n" \ -- " bis %5, %5, %1\n" \ -- " stl_c %1, %2\n" \ -- "1: xor %1, 1, %1\n" \ -- " stl %1, %3" \ -- : "=r" (old32), \ -- "=&r" (cur32), \ -- "=m" (__drm_dummy_lock(lock)),\ -- "=m" (ret) \ -- : "r" (old), \ -- "r" (new)); \ -- } while(0) -- --#elif defined(__sparc__) -- --#define DRM_CAS(lock,old,new,__ret) \ --do { register unsigned int __old __asm("o0"); \ -- register unsigned int __new __asm("o1"); \ -- register volatile unsigned int *__lock __asm("o2"); \ -- __old = old; \ -- __new = new; \ -- __lock = (volatile unsigned int *)lock; \ -- __asm__ __volatile__( \ -- /*"cas [%2], %3, %0"*/ \ -- ".word 0xd3e29008\n\t" \ -- /*"membar #StoreStore | #StoreLoad"*/ \ -- ".word 0x8143e00a" \ -- : "=&r" (__new) \ -- : "0" (__new), \ -- "r" (__lock), \ -- "r" (__old) \ -- : "memory"); \ -- __ret = (__new != __old); \ --} while(0) -- --#elif defined(__ia64__) -- --#ifdef __INTEL_COMPILER --/* this currently generates bad code (missing stop bits)... */ --#include -- --#define DRM_CAS(lock,old,new,__ret) \ -- do { \ -- unsigned long __result, __old = (old) & 0xffffffff; \ -- __mf(); \ -- __result = _InterlockedCompareExchange_acq(&__drm_dummy_lock(lock), (new), __old);\ -- __ret = (__result) != (__old); \ --/* __ret = (__sync_val_compare_and_swap(&__drm_dummy_lock(lock), \ -- (old), (new)) \ -- != (old)); */\ -- } while (0) -- --#else --#define DRM_CAS(lock,old,new,__ret) \ -- do { \ -- unsigned int __result, __old = (old); \ -- __asm__ __volatile__( \ -- "mf\n" \ -- "mov ar.ccv=%2\n" \ -- ";;\n" \ -- "cmpxchg4.acq %0=%1,%3,ar.ccv" \ -- : "=r" (__result), "=m" (__drm_dummy_lock(lock)) \ -- : "r" ((unsigned long)__old), "r" (new) \ -- : "memory"); \ -- __ret = (__result) != (__old); \ -- } while (0) -- --#endif -- --#elif defined(__powerpc__) -- --#define DRM_CAS(lock,old,new,__ret) \ -- do { \ -- __asm__ __volatile__( \ -- "sync;" \ -- "0: lwarx %0,0,%1;" \ -- " xor. %0,%3,%0;" \ -- " bne 1f;" \ -- " stwcx. %2,0,%1;" \ -- " bne- 0b;" \ -- "1: " \ -- "sync;" \ -- : "=&r"(__ret) \ -- : "r"(lock), "r"(new), "r"(old) \ -- : "cr0", "memory"); \ -- } while (0) -- --#endif /* architecture */ --#endif /* __GNUC__ >= 2 */ -- --#ifndef DRM_CAS --#define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */ --#endif -- --#if defined(__alpha__) || defined(__powerpc__) --#define DRM_CAS_RESULT(_result) int _result --#else --#define DRM_CAS_RESULT(_result) char _result --#endif -- --#define DRM_LIGHT_LOCK(fd,lock,context) \ -- do { \ -- DRM_CAS_RESULT(__ret); \ -- DRM_CAS(lock,context,DRM_LOCK_HELD|context,__ret); \ -- if (__ret) drmGetLock(fd,context,0); \ -- } while(0) -- -- /* This one counts fast locks -- for -- benchmarking only. */ --#define DRM_LIGHT_LOCK_COUNT(fd,lock,context,count) \ -- do { \ -- DRM_CAS_RESULT(__ret); \ -- DRM_CAS(lock,context,DRM_LOCK_HELD|context,__ret); \ -- if (__ret) drmGetLock(fd,context,0); \ -- else ++count; \ -- } while(0) -- --#define DRM_LOCK(fd,lock,context,flags) \ -- do { \ -- if (flags) drmGetLock(fd,context,flags); \ -- else DRM_LIGHT_LOCK(fd,lock,context); \ -- } while(0) -- --#define DRM_UNLOCK(fd,lock,context) \ -- do { \ -- DRM_CAS_RESULT(__ret); \ -- DRM_CAS(lock,DRM_LOCK_HELD|context,context,__ret); \ -- if (__ret) drmUnlock(fd,context); \ -- } while(0) -- -- /* Simple spin locks */ --#define DRM_SPINLOCK(spin,val) \ -- do { \ -- DRM_CAS_RESULT(__ret); \ -- do { \ -- DRM_CAS(spin,0,val,__ret); \ -- if (__ret) while ((spin)->lock); \ -- } while (__ret); \ -- } while(0) -- --#define DRM_SPINLOCK_TAKE(spin,val) \ -- do { \ -- DRM_CAS_RESULT(__ret); \ -- int cur; \ -- do { \ -- cur = (*spin).lock; \ -- DRM_CAS(spin,cur,val,__ret); \ -- } while (__ret); \ -- } while(0) -- --#define DRM_SPINLOCK_COUNT(spin,val,count,__ret) \ -- do { \ -- int __i; \ -- __ret = 1; \ -- for (__i = 0; __ret && __i < count; __i++) { \ -- DRM_CAS(spin,0,val,__ret); \ -- if (__ret) for (;__i < count && (spin)->lock; __i++); \ -- } \ -- } while(0) -- --#define DRM_SPINUNLOCK(spin,val) \ -- do { \ -- DRM_CAS_RESULT(__ret); \ -- if ((*spin).lock == val) { /* else server stole lock */ \ -- do { \ -- DRM_CAS(spin,val,0,__ret); \ -- } while (__ret); \ -- } \ -- } while(0) -- --/* General user-level programmer's API: unprivileged */ --extern int drmAvailable(void); --extern int drmOpen(const char *name, const char *busid); --extern int drmClose(int fd); --extern drmVersionPtr drmGetVersion(int fd); --extern drmVersionPtr drmGetLibVersion(int fd); --extern void drmFreeVersion(drmVersionPtr); --extern int drmGetMagic(int fd, drm_magic_t * magic); --extern char *drmGetBusid(int fd); --extern int drmGetInterruptFromBusID(int fd, int busnum, int devnum, -- int funcnum); --extern int drmGetMap(int fd, int idx, drm_handle_t *offset, -- drmSize *size, drmMapType *type, -- drmMapFlags *flags, drm_handle_t *handle, -- int *mtrr); --extern int drmGetClient(int fd, int idx, int *auth, int *pid, -- int *uid, unsigned long *magic, -- unsigned long *iocs); --extern int drmGetStats(int fd, drmStatsT *stats); --extern int drmSetInterfaceVersion(int fd, drmSetVersion *version); --extern int drmCommandNone(int fd, unsigned long drmCommandIndex); --extern int drmCommandRead(int fd, unsigned long drmCommandIndex, -- void *data, unsigned long size); --extern int drmCommandWrite(int fd, unsigned long drmCommandIndex, -- void *data, unsigned long size); --extern int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, -- void *data, unsigned long size); -- --/* General user-level programmer's API: X server (root) only */ --extern void drmFreeBusid(const char *busid); --extern int drmSetBusid(int fd, const char *busid); --extern int drmAuthMagic(int fd, drm_magic_t magic); --extern int drmAddMap(int fd, -- drm_handle_t offset, -- drmSize size, -- drmMapType type, -- drmMapFlags flags, -- drm_handle_t * handle); --extern int drmRmMap(int fd, drm_handle_t handle); --extern int drmAddContextPrivateMapping(int fd, drm_context_t ctx_id, -- drm_handle_t handle); -- --extern int drmAddBufs(int fd, int count, int size, -- drmBufDescFlags flags, -- int agp_offset); --extern int drmMarkBufs(int fd, double low, double high); --extern int drmCreateContext(int fd, drm_context_t * handle); --extern int drmSetContextFlags(int fd, drm_context_t context, -- drm_context_tFlags flags); --extern int drmGetContextFlags(int fd, drm_context_t context, -- drm_context_tFlagsPtr flags); --extern int drmAddContextTag(int fd, drm_context_t context, void *tag); --extern int drmDelContextTag(int fd, drm_context_t context); --extern void *drmGetContextTag(int fd, drm_context_t context); --extern drm_context_t * drmGetReservedContextList(int fd, int *count); --extern void drmFreeReservedContextList(drm_context_t *); --extern int drmSwitchToContext(int fd, drm_context_t context); --extern int drmDestroyContext(int fd, drm_context_t handle); --extern int drmCreateDrawable(int fd, drm_drawable_t * handle); --extern int drmDestroyDrawable(int fd, drm_drawable_t handle); --extern int drmUpdateDrawableInfo(int fd, drm_drawable_t handle, -- drm_drawable_info_type_t type, -- unsigned int num, void *data); --extern int drmCtlInstHandler(int fd, int irq); --extern int drmCtlUninstHandler(int fd); --extern int drmInstallSIGIOHandler(int fd, -- void (*f)(int fd, -- void *oldctx, -- void *newctx)); --extern int drmRemoveSIGIOHandler(int fd); -- --/* General user-level programmer's API: authenticated client and/or X */ --extern int drmMap(int fd, -- drm_handle_t handle, -- drmSize size, -- drmAddressPtr address); --extern int drmUnmap(drmAddress address, drmSize size); --extern drmBufInfoPtr drmGetBufInfo(int fd); --extern drmBufMapPtr drmMapBufs(int fd); --extern int drmUnmapBufs(drmBufMapPtr bufs); --extern int drmDMA(int fd, drmDMAReqPtr request); --extern int drmFreeBufs(int fd, int count, int *list); --extern int drmGetLock(int fd, -- drm_context_t context, -- drmLockFlags flags); --extern int drmUnlock(int fd, drm_context_t context); --extern int drmFinish(int fd, int context, drmLockFlags flags); --extern int drmGetContextPrivateMapping(int fd, drm_context_t ctx_id, -- drm_handle_t * handle); -- --/* AGP/GART support: X server (root) only */ --extern int drmAgpAcquire(int fd); --extern int drmAgpRelease(int fd); --extern int drmAgpEnable(int fd, unsigned long mode); --extern int drmAgpAlloc(int fd, unsigned long size, -- unsigned long type, unsigned long *address, -- drm_handle_t *handle); --extern int drmAgpFree(int fd, drm_handle_t handle); --extern int drmAgpBind(int fd, drm_handle_t handle, -- unsigned long offset); --extern int drmAgpUnbind(int fd, drm_handle_t handle); -- --/* AGP/GART info: authenticated client and/or X */ --extern int drmAgpVersionMajor(int fd); --extern int drmAgpVersionMinor(int fd); --extern unsigned long drmAgpGetMode(int fd); --extern unsigned long drmAgpBase(int fd); /* Physical location */ --extern unsigned long drmAgpSize(int fd); /* Bytes */ --extern unsigned long drmAgpMemoryUsed(int fd); --extern unsigned long drmAgpMemoryAvail(int fd); --extern unsigned int drmAgpVendorId(int fd); --extern unsigned int drmAgpDeviceId(int fd); -- --/* PCI scatter/gather support: X server (root) only */ --extern int drmScatterGatherAlloc(int fd, unsigned long size, -- drm_handle_t *handle); --extern int drmScatterGatherFree(int fd, drm_handle_t handle); -- --extern int drmWaitVBlank(int fd, drmVBlankPtr vbl); -- --/* Support routines */ --extern int drmError(int err, const char *label); --extern void *drmMalloc(int size); --extern void drmFree(void *pt); -- --/* Hash table routines */ --extern void *drmHashCreate(void); --extern int drmHashDestroy(void *t); --extern int drmHashLookup(void *t, unsigned long key, void **value); --extern int drmHashInsert(void *t, unsigned long key, void *value); --extern int drmHashDelete(void *t, unsigned long key); --extern int drmHashFirst(void *t, unsigned long *key, void **value); --extern int drmHashNext(void *t, unsigned long *key, void **value); -- --/* PRNG routines */ --extern void *drmRandomCreate(unsigned long seed); --extern int drmRandomDestroy(void *state); --extern unsigned long drmRandom(void *state); --extern double drmRandomDouble(void *state); -- --/* Skip list routines */ -- --extern void *drmSLCreate(void); --extern int drmSLDestroy(void *l); --extern int drmSLLookup(void *l, unsigned long key, void **value); --extern int drmSLInsert(void *l, unsigned long key, void *value); --extern int drmSLDelete(void *l, unsigned long key); --extern int drmSLNext(void *l, unsigned long *key, void **value); --extern int drmSLFirst(void *l, unsigned long *key, void **value); --extern void drmSLDump(void *l); --extern int drmSLLookupNeighbors(void *l, unsigned long key, -- unsigned long *prev_key, void **prev_value, -- unsigned long *next_key, void **next_value); -- --#endif rmfile ./source/x11/xorg-server/use-system-drm-fromgit.patch hunk ./source/x11/xorg-server/xkbcopykeymap-fix.patch 1 -From: Daniel Stone -Date: Sun, 5 Nov 2006 00:47:59 +0000 (+0200) -Subject: XkbCopyKeymap: don't iterate broken types, or dereference null pointers -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=389275d240e4ba19d62fda0f138a45c7ecb245ff - -XkbCopyKeymap: don't iterate broken types, or dereference null pointers - -Don't iterate invalid destination types (>= num_types) when coping key -types. -Don't free key_aliases if it's NULL (theoretical, but sure). -Make sure dst's label_font gets allocated if it's NULL. -(Thanks, Chris Lee.) ---- - ---- a/xkb/xkbUtils.c -+++ b/xkb/xkbUtils.c -@@ -1047,34 +1047,40 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr - } - } - -- if (src->map->types) { -- if (src->map->size_types > dst->map->size_types) { -- if (dst->map->types) { -+ if (src->map->types && src->map->num_types) { -+ if (src->map->num_types > dst->map->size_types || -+ !dst->map->types || !dst->map->size_types) { -+ if (dst->map->types && dst->map->size_types) { - tmp = xrealloc(dst->map->types, -- src->map->size_types * sizeof(XkbKeyTypeRec)); -+ src->map->num_types * sizeof(XkbKeyTypeRec)); - if (!tmp) - return FALSE; - dst->map->types = tmp; - bzero(dst->map->types + -- (dst->map->size_types * sizeof(XkbKeyTypeRec)), -- (src->map->size_types - dst->map->size_types) * -+ (dst->map->num_types * sizeof(XkbKeyTypeRec)), -+ (src->map->num_types - dst->map->size_types) * - sizeof(XkbKeyTypeRec)); - } - else { -- tmp = xcalloc(src->map->size_types, sizeof(XkbKeyTypeRec)); -+ tmp = xcalloc(src->map->num_types, sizeof(XkbKeyTypeRec)); - if (!tmp) - return FALSE; - dst->map->types = tmp; - } - } -- else if (src->map->size_types < dst->map->size_types) { -- if (dst->map->types) { -- for (i = src->map->num_types, dtype = (dst->map->types + i); -- i < dst->map->size_types; i++, dtype++) { -- if (dtype->level_names) -- xfree(dtype->level_names); -- dtype->level_names = NULL; -- dtype->num_levels = 0; -+ else if (src->map->num_types < dst->map->num_types && -+ dst->map->types) { -+ for (i = src->map->num_types, dtype = (dst->map->types + i); -+ i < dst->map->num_types; i++, dtype++) { -+ if (dtype->level_names) -+ xfree(dtype->level_names); -+ dtype->level_names = NULL; -+ dtype->num_levels = 0; -+ if (dtype->map_count) { -+ if (dtype->map) -+ xfree(dtype->map); -+ if (dtype->preserve) -+ xfree(dtype->preserve); - } - } - } -@@ -1082,16 +1088,18 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr - stype = src->map->types; - dtype = dst->map->types; - for (i = 0; i < src->map->num_types; i++, dtype++, stype++) { -- if (stype->num_levels) { -+ if (stype->num_levels && stype->level_names) { - if (stype->num_levels != dtype->num_levels && -- dtype->num_levels && dtype->level_names) { -+ dtype->num_levels && dtype->level_names && -+ i < dst->map->num_types) { - tmp = xrealloc(dtype->level_names, - stype->num_levels * sizeof(Atom)); - if (!tmp) - continue; - dtype->level_names = tmp; - } -- else if (!dtype->num_levels || !dtype->level_names) { -+ else if (!dtype->num_levels || !dtype->level_names || -+ i >= dst->map->num_types) { - tmp = xalloc(stype->num_levels * sizeof(Atom)); - if (!tmp) - continue; -@@ -1102,7 +1110,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr - stype->num_levels * sizeof(Atom)); - } - else { -- if (dtype->num_levels && dtype->level_names) -+ if (dtype->num_levels && dtype->level_names && -+ i < dst->map->num_types) - xfree(dtype->level_names); - dtype->num_levels = 0; - dtype->level_names = NULL; -@@ -1114,15 +1123,17 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr - if (stype->map_count) { - if (stype->map) { - if (stype->map_count != dtype->map_count && -- dtype->map_count && dtype->map) { -+ dtype->map_count && dtype->map && -+ i < dst->map->num_types) { - tmp = xrealloc(dtype->map, - stype->map_count * - sizeof(XkbKTMapEntryRec)); - if (!tmp) - return FALSE; - dtype->map = tmp; -- } -- else if (!dtype->map_count || !dtype->map) { -+ } -+ else if (!dtype->map_count || !dtype->map || -+ i >= dst->map->num_types) { - tmp = xalloc(stype->map_count * - sizeof(XkbKTMapEntryRec)); - if (!tmp) -@@ -1136,7 +1147,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr - - if (stype->preserve) { - if (stype->map_count != dtype->map_count && -- dtype->map_count && dtype->preserve) { -+ dtype->map_count && dtype->preserve && -+ i < dst->map->num_types) { - tmp = xrealloc(dtype->preserve, - stype->map_count * - sizeof(XkbModsRec)); -@@ -1144,7 +1156,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr - return FALSE; - dtype->preserve = tmp; - } -- else if (!dtype->preserve || !dtype->map_count) { -+ else if (!dtype->preserve || !dtype->map_count || -+ i >= dst->map->num_types) { - tmp = xalloc(stype->map_count * - sizeof(XkbModsRec)); - if (!tmp) -@@ -1179,14 +1192,14 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr - xfree(dtype->level_names); - if (dtype->map && dtype->map_count) - xfree(dtype->map); -- if (dtype->preserve && dtype->preserve) -+ if (dtype->preserve && dtype->map_count) - xfree(dtype->preserve); - } - xfree(dst->map->types); - dst->map->types = NULL; - } - } -- dst->map->size_types = src->map->size_types; -+ dst->map->size_types = src->map->num_types; - dst->map->num_types = src->map->num_types; - - if (src->map->modmap) { -@@ -1957,7 +1970,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr - dst->geom->num_key_aliases = dst->geom->sz_key_aliases; - } - else { -- if (dst->geom->sz_key_aliases) { -+ if (dst->geom->sz_key_aliases && dst->geom->key_aliases) { - xfree(dst->geom->key_aliases); - dst->geom->key_aliases = NULL; - } -@@ -1967,13 +1980,16 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr - - /* font */ - if (src->geom->label_font) { -- if (strlen(src->geom->label_font) != -+ if (!dst->geom->label_font) { -+ tmp = xalloc(strlen(src->geom->label_font)); -+ if (!tmp) -+ return FALSE; -+ dst->geom->label_font = tmp; -+ } -+ else if (strlen(src->geom->label_font) != - strlen(dst->geom->label_font)) { -- if (dst->geom->label_font) -- tmp = xrealloc(dst->geom->label_font, -- strlen(src->geom->label_font)); -- else -- tmp = xalloc(strlen(src->geom->label_font)); -+ tmp = xrealloc(dst->geom->label_font, -+ strlen(src->geom->label_font)); - if (!tmp) - return FALSE; - dst->geom->label_font = tmp; rmfile ./source/x11/xorg-server/xkbcopykeymap-fix.patch hunk ./source/x11/xorg-server/xorg-debug-fixes.patch 1 -diff -Naur xorg-server-1.2.99.0.orig/GL/glx/glapi.c xorg-server-1.2.99.0/GL/glx/glapi.c ---- xorg-server-1.2.99.0.orig/GL/glx/glapi.c 2006-11-01 23:28:29.000000000 +0100 -+++ xorg-server-1.2.99.0/GL/glx/glapi.c 2006-11-14 11:49:34.000000000 +0100 -@@ -997,7 +997,7 @@ - assert(blendColorOffset == _gloffset_BlendColor); - assert(blendColorOffset == offset); - } -- { -+/* { - GLuint secondaryColor3fOffset = _glapi_get_proc_offset("glSecondaryColor3fEXT"); - char *secondaryColor3fFunc = (char*) &table->SecondaryColor3fEXT; - GLuint offset = (secondaryColor3fFunc - (char *) table) / sizeof(void *); -@@ -1012,7 +1012,7 @@ - assert(pointParameterivOffset == _gloffset_PointParameterivNV); - assert(pointParameterivOffset == offset); - assert(_glapi_get_proc_address("glPointParameterivNV") == (_glapi_proc) &glPointParameterivNV); -- } -+ } */ - { - GLuint setFenceOffset = _glapi_get_proc_offset("glSetFenceNV"); - char *setFenceFunc = (char*) &table->SetFenceNV; -diff -Naur xorg-server-1.2.99.0.orig/hw/xfree86/x86emu/debug.c xorg-server-1.2.99.0/hw/xfree86/x86emu/debug.c ---- xorg-server-1.2.99.0.orig/hw/xfree86/x86emu/debug.c 2006-07-20 22:27:48.000000000 +0200 -+++ xorg-server-1.2.99.0/hw/xfree86/x86emu/debug.c 2006-11-14 11:50:10.000000000 +0100 -@@ -38,6 +38,7 @@ - ****************************************************************************/ - - #include "x86emu/x86emui.h" -+#include - #ifndef NO_SYS_HEADERS - #include - #include rmfile ./source/x11/xorg-server/xorg-debug-fixes.patch } From krics at linuxforum.hu Tue Dec 5 11:31:06 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 11:31:31 2006 Subject: [Frugalware-darcs] xorg-mess: xorg-server: added a missing patch Message-ID: <20061205103108.1018AFA4709@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205103134-d209c-406a767921991847eb18c093f93c9bc5e98749aa.gz; [xorg-server: added a missing patch Christian Hamar alias krix **20061205103134] { addfile ./source/x11/xorg-server/xorg-mesa.patch hunk ./source/x11/xorg-server/xorg-mesa.patch 1 +--- xorg-server-1.1.99.903/GL/mesa/main/Makefile.am.orig 2006-12-03 16:24:27.786630074 +0100 ++++ xorg-server-1.1.99.903/GL/mesa/main/Makefile.am 2006-12-03 16:24:37.985074238 +0100 +@@ -60,6 +60,7 @@ + light.c \ + lines.c \ + matrix.c \ ++ mipmap.c \ + mm.c \ + occlude.c \ + pixel.c \ } From krics at linuxforum.hu Tue Dec 5 12:14:56 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:15:03 2006 Subject: [Frugalware-darcs] xorg-mess: xf86-input-keyboard-1.1.1-1-x86_64 Message-ID: <20061205111456.AE885FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205111506-d209c-b0514f029ec134e5a8ea91fa65e743c543f7866a.gz; [xf86-input-keyboard-1.1.1-1-x86_64 Christian Hamar alias krix **20061205111506 * Downgrade for RC3 ] { hunk ./source/x11/xf86-input-keyboard/FrugalBuild 5 -pkgver=1.2.0 -pkgrel=1 +pkgver=1.1.1 +pkgrel=2 hunk ./source/x11/xf86-input-keyboard/FrugalBuild 8 -depends=('xorg-server>=1.2.99.0') -makedepends=('util-macros') -source=($source \ - http://ftp.frugalware.org/pub/other/sources/$pkgname/fixes-from-git.patch) -sha1sums=('9c482d0a30702a6a178d3e8bee577d1aa53363fb' \ - 'f74d00a4859b2b82b1162f21ccde3e5c3410f5b8') - -build() { - Fpatchall - Fautoreconf - Fmake - Fmakeinstall -} +depends=('xorg-server>=1.1.99.903') +makedepends=('util-macros>=1.1.3' 'randrproto') +sha1sums=('5711dd3fa95eeded58dabf9a314071ef699acfaf') } From krics at linuxforum.hu Tue Dec 5 12:16:03 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:16:05 2006 Subject: [Frugalware-darcs] xorg-mess: xorg.sh: strip out hardcoded pkgrel for -input pkgs. :S Message-ID: <20061205111603.AA433FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205111651-d209c-f6f82b05dc661552ade6cbae90119f8d09dbb8fa.gz; [xorg.sh: strip out hardcoded pkgrel for -input pkgs. :S Christian Hamar alias krix **20061205111651] { hunk ./source/include/xorg.sh 15 - pkgrel=1 } From krics at linuxforum.hu Tue Dec 5 12:20:45 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:20:48 2006 Subject: [Frugalware-darcs] frugalware-current: xorg.sh: cut out pkgrel=1 Message-ID: <20061205112045.6EA35FA46FE@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205111946-d209c-a5bf204734e9138b307107db2244ef19a8961cbb.gz; [xorg.sh: cut out pkgrel=1 Christian Hamar alias krix **20061205111946 * Cut out pkgrel=1 for xf86-input pkgs* :S ] { hunk ./source/include/xorg.sh 15 - pkgrel=1 } From krics at linuxforum.hu Tue Dec 5 12:28:41 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:28:49 2006 Subject: [Frugalware-darcs] xorg-mess: xf86-input-mouse-1.1.2-2-x86_64 Message-ID: <20061205112842.08B49FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205112921-d209c-0af4d4f80153849da613540854c3eff6758a1e4e.gz; [xf86-input-mouse-1.1.2-2-x86_64 Christian Hamar alias krix **20061205112921 * Downgrade for new xorg ] { hunk ./source/x11/xf86-input-mouse/FrugalBuild 5 -pkgver=1.2.0 -pkgrel=1 +pkgver=1.1.2 +pkgrel=2 hunk ./source/x11/xf86-input-mouse/FrugalBuild 9 -depends=('xorg-server>=1.2.99.0') -sha1sums=('a68e4164f3f09f8ee6d29706ec7b344210bb40d5') +depends=('xorg-server>=1.1.99.903') +sha1sums=('a774fd8ee1fb4d7b31371ac6e9bad0017f2ccc91') } From krics at linuxforum.hu Tue Dec 5 12:35:46 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:35:48 2006 Subject: [Frugalware-darcs] xorg-mess: xf86-video-vesa-1.3.0-1-x86_64 Message-ID: <20061205113546.5A8CEFA4706@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205113632-d209c-5de5b7eb0e40f3042f8dd086c5176f6dc89abb78.gz; [xf86-video-vesa-1.3.0-1-x86_64 Christian Hamar alias krix **20061205113632 * Version bump ] { hunk ./source/x11/xf86-video-vesa/FrugalBuild 5 -pkgver=1.2.2 +pkgver=1.3.0 hunk ./source/x11/xf86-video-vesa/FrugalBuild 14 -sha1sums=('aa22994fac3dadf41b7b641a816f704129831a77') +sha1sums=('09d74f838c07c58b6eba3600f3afa5fb74420ff4') } From krics at linuxforum.hu Tue Dec 5 12:38:59 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:39:01 2006 Subject: [Frugalware-darcs] xorg-mess: xdm-1.1.2-1-x86_64 Message-ID: <20061205113859.503E7FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205113945-d209c-3301de20d7861266cc72a35f4c84dd4395ad0575.gz; [xdm-1.1.2-1-x86_64 Christian Hamar alias krix **20061205113945 * Version bump ] { hunk ./source/x11/xdm/FrugalBuild 5 -pkgver=1.1.0 +pkgver=1.1.2 hunk ./source/x11/xdm/FrugalBuild 11 -depends=('xrdb' 'libxdmcp' 'libxaw' 'xinit' 'libx11' 'libxft' 'xorg-server') +depends=('xrdb' 'libxdmcp' 'libxaw' 'xinit' 'libx11>=1.1.1' 'libxft' 'xorg-server>=1.1.99.903') hunk ./source/x11/xdm/FrugalBuild 16 -sha1sums=('6a940ce1a9adc9652982024f218d76ce7894c0cf' \ +sha1sums=('c7254c2378cde6dd74e4efa3888cce122b9c383e' \ } From krics at linuxforum.hu Tue Dec 5 12:42:03 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:42:05 2006 Subject: [Frugalware-darcs] xorg-mess: xf86-video-s3-0.5.0-1-x86_64 Message-ID: <20061205114203.461E5FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205114255-d209c-cd3fcdef35e99d327bb191fe3093f14aefe04c5b.gz; [xf86-video-s3-0.5.0-1-x86_64 Christian Hamar alias krix **20061205114255 * VErsion bump ] { hunk ./source/x11/xf86-video-s3/FrugalBuild 5 -pkgver=0.4.1 +pkgver=0.5.0 hunk ./source/x11/xf86-video-s3/FrugalBuild 14 -sha1sums=('de1d269f906ea811a1428a485d7cde6b76dafd3c') +sha1sums=('1ae624635f71f82ecc73999cad5499a1d5d69be6') } From krics at linuxforum.hu Tue Dec 5 12:45:54 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:45:56 2006 Subject: [Frugalware-darcs] xorg-mess: xf86-video-nv-1.2.1-1-x86_64 Message-ID: <20061205114555.4DF5AFA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205114643-d209c-93c54481379c99d7ca8f5da09fe627a367801529.gz; [xf86-video-nv-1.2.1-1-x86_64 Christian Hamar alias krix **20061205114643 * Version bump ] { hunk ./source/x11/xf86-video-nv/FrugalBuild 5 -pkgver=1.2.0 +pkgver=1.2.1 hunk ./source/x11/xf86-video-nv/FrugalBuild 11 -depends=('xorg-server>=1.1.0') +depends=('xorg-server>=1.1.99.903') hunk ./source/x11/xf86-video-nv/FrugalBuild 14 -sha1sums=('d98cb84e7220251fdcd278c4269763f17aef1e9b') +sha1sums=('8526a967dc393834787a68cbe4b9093611c983fa') } From krics at linuxforum.hu Tue Dec 5 12:48:37 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:48:38 2006 Subject: [Frugalware-darcs] xorg-mess: xf86-video-i128-1.2.1-1-x86_64 Message-ID: <20061205114837.893CBFA4706@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205114928-d209c-eabe43450b1ff2949c01c38088a55bb387dbc9bf.gz; [xf86-video-i128-1.2.1-1-x86_64 Christian Hamar alias krix **20061205114928 * Version bump ] { hunk ./source/x11/xf86-video-i128/FrugalBuild 5 -pkgver=1.2.0 +pkgver=1.2.1 hunk ./source/x11/xf86-video-i128/FrugalBuild 11 -depends=('xorg-server>=1.1.0') +depends=('xorg-server>=1.1.99.903') hunk ./source/x11/xf86-video-i128/FrugalBuild 14 -sha1sums=('69a323b0f6d1cdec1bd77b1f955e2096c709800b') +sha1sums=('8906c29c25dc4b54958052b3327d4d2150d1155e') } From krics at linuxforum.hu Tue Dec 5 12:53:03 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 12:53:05 2006 Subject: [Frugalware-darcs] xorg-mess: xf86-video-sis-0.9.3-1-x86_64 Message-ID: <20061205115303.550DAFA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205115352-d209c-cde3a0d99563746897dea90d24a0174278c8dc8b.gz; [xf86-video-sis-0.9.3-1-x86_64 Christian Hamar alias krix **20061205115352 * Version bump ] { hunk ./source/x11/xf86-video-sis/FrugalBuild 5 -pkgver=0.9.2 +pkgver=0.9.3 hunk ./source/x11/xf86-video-sis/FrugalBuild 14 -sha1sums=('ac7d2c5d19d93e28a3331c2a05349c468e1d88cb') +sha1sums=('fb386185a91bbc6764445ef251d4a0216ec9b9d0') } From crazy at frugalware.org Tue Dec 5 15:25:17 2006 From: crazy at frugalware.org (crazy) Date: Tue Dec 5 15:25:20 2006 Subject: [Frugalware-darcs] frugalware-current: clucene-0.9.15-1-i686 Message-ID: <20061205142517.5EA72FA4707@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205141924-f6986-2189e0684c88bfc1228ddbd2a4db1e884747a027.gz; [clucene-0.9.15-1-i686 crazy **20061205141924 * up2date fix * s/build/_F_cd_path/ * depends fix * removed source|url and added _F_sourceforge_* :) * krix ping :P pls add to x86_64 and close the bug in BTS thx ;) ] { hunk ./source/lib-extra/clucene/FrugalBuild 8 -url="http://clucene.sourceforge.net/" -depends=('') +depends=('libstdc++') hunk ./source/lib-extra/clucene/FrugalBuild 11 -_F_sourceforge_ext=.tar.bz2 +_F_sourceforge_ext=".tar.bz2" +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_name="$pkgname-core" +_F_sourceforge_broken_up2date=1 hunk ./source/lib-extra/clucene/FrugalBuild 16 -source=${source//$pkgname-/$pkgname-core-} +_F_cd_path="$pkgname-core-$pkgver" hunk ./source/lib-extra/clucene/FrugalBuild 19 -build() { - Fcd $pkgname-core-$pkgver - Fbuild -} } From vmiklos at frugalware.org Tue Dec 5 16:41:35 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 16:41:38 2006 Subject: [Frugalware-darcs] frugalware-current: corefonts-2.0r1-1-i686 Message-ID: <20061205154135.EB503FA4707@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205153939-e2957-ee1fe539c59a65aa046115b74014f5f6e763f7e7.gz; [corefonts-2.0r1-1-i686 VMiklos **20061205153939 version bump ] { hunk ./source/xlib/corefonts/FrugalBuild 5 -pkgver=1.3r4 -pkgrel=4 +pkgver=2.0r1 +pkgrel=1 hunk ./source/xlib/corefonts/FrugalBuild 13 -up2date="lynx -dump 'http://heanet.dl.sourceforge.net/sourceforge/corefonts/?C=M;O=D'|grep spec$|sed -n -e 's|.*s-\(.*\)\.s.*|\1|' -e 's/-/r/' -e '1 p'" -source=(`eval echo ${source/$pkgname-$pkgver.tar.gz/{andale32.exe,arial32.exe,arialb32.exe,comic32.exe,courie32.exe,georgi32.exe,impact32.exe,times32.exe,trebuc32.exe,verdan32.exe,webdin32.exe}}`) +up2date="lynx -dump $url|grep spec$|sed 's/.*corefonts-\(.*\)\.s.*/\1/;s/-/r/;q'" +source=(`eval echo ${source/$pkgname-$pkgver.tar.gz/{andale32.exe,arial32.exe,arialb32.exe,comic32.exe,courie32.exe,georgi32.exe,impact32.exe,times32.exe,trebuc32.exe,verdan32.exe,webdin32.exe,wd97vwr32.exe}}`) + +# test page: http://volker.dnsalias.net/linux/mstt_test.html + +build() +{ + Fmkdir /tmp/.corefonts + chmod 1777 $Fdestdir/tmp + mv $Fsrcdir/*.exe $Fdestdir/tmp/.corefonts +} + hunk ./source/xlib/corefonts/FrugalBuild 35 - '2fb4a42c53e50bc70707a7b3c57baf62ba58398f') - -# test page: http://volker.dnsalias.net/linux/mstt_test.html - -build() -{ - Fmkdir /tmp/.corefonts - chmod 1777 $Fdestdir/tmp - mv $Fsrcdir/*.exe $Fdestdir/tmp/.corefonts -} + '2fb4a42c53e50bc70707a7b3c57baf62ba58398f' \ + '8edf758f92513094a94e50b7826cd6f2b7696b8c') } From vmiklos at frugalware.org Tue Dec 5 16:51:32 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 16:51:39 2006 Subject: [Frugalware-darcs] frugalware-current: avifile-0.7.45_20060306-1-i686 Message-ID: <20061205155132.6F3C2FA4707@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205152841-e2957-ec76b0b257c7a8a18b7dd8b51e5a292134be95df.gz; [avifile-0.7.45_20060306-1-i686 VMiklos **20061205152841 inherit source() from sourceforge.sh ] { hunk ./source/xapps-extra/avifile/FrugalBuild 14 +_F_sourceforge_ext=".tar.bz2" hunk ./source/xapps-extra/avifile/FrugalBuild 17 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-0.7-0.7.45.tar.bz2 \ - gcc41.patch no-O4s-thx.patch fix-tail_head-1.patch \ +source=(`echo $source|sed "s/${pkgver//_/-}/0.7-0.7.45/"` gcc41.patch no-O4s-thx.patch fix-tail_head-1.patch \ } From vmiklos at frugalware.org Tue Dec 5 16:51:31 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 16:51:41 2006 Subject: [Frugalware-darcs] frugalware-current: bashburn-1.8.0-1-i686 Message-ID: <20061205155131.E6453FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205152946-e2957-5cbb86c15db88d6ce8ba39b77344e47faa6d79ae.gz; [bashburn-1.8.0-1-i686 VMiklos **20061205152946 inherit source from sourceforge.sh ] { hunk ./source/multimedia/bashburn/FrugalBuild 12 +_F_sourceforge_dirname="bashburn" +_F_sourceforge_name="BashBurn" hunk ./source/multimedia/bashburn/FrugalBuild 15 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/BashBurn-$pkgver.tar.gz) } From krics at linuxforum.hu Tue Dec 5 17:16:58 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 17:17:02 2006 Subject: [Frugalware-darcs] xorg-mess: xf86-video-mga-1.4.5-1-x86_64 Message-ID: <20061205161658.BCEF7FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205161745-d209c-ac884aa0784fb3935d2d3829610cd96b2ee9e4c8.gz; [xf86-video-mga-1.4.5-1-x86_64 Christian Hamar alias krix **20061205161745 * Version bump ] { hunk ./source/x11/xf86-video-mga/FrugalBuild 5 -pkgver=1.4.4 +pkgver=1.4.5 hunk ./source/x11/xf86-video-mga/FrugalBuild 14 -sha1sums=('8cee9932f1240e0c3e685a0fe64f0ac903747c6b') +sha1sums=('d05a77183d5ddd3100a6954ebf16d96aea43f133') } From krics at linuxforum.hu Tue Dec 5 17:22:16 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 17:22:18 2006 Subject: [Frugalware-darcs] xorg-mess: xf86-video-tdfx-1.3.0-1-x86_64 Message-ID: <20061205162216.B4F34FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=xorg-mess;a=darcs_commitdiff;h=20061205162248-d209c-36b850e0da1d3f5adc7bb9c97bf3ec6afba727fd.gz; [xf86-video-tdfx-1.3.0-1-x86_64 Christian Hamar alias krix **20061205162248 * Version bump ] { hunk ./source/x11/xf86-video-tdfx/FrugalBuild 5 -pkgver=1.2.2 +pkgver=1.3.0 hunk ./source/x11/xf86-video-tdfx/FrugalBuild 14 -sha1sums=('3a831921f249574d4a387b7917a39c4b9240fecc') +sha1sums=('8089883c87b64c2876b9152b4820901cc6273f57') } From krics at linuxforum.hu Tue Dec 5 17:28:52 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 17:28:54 2006 Subject: [Frugalware-darcs] frugalware-current: xterm-223-1-x86_64 Message-ID: <20061205162852.3361AFA4706@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205162851-d209c-5f6cd872ae1903c0dea6b159c6f21afae8000268.gz; [xterm-223-1-x86_64 Christian Hamar alias krix **20061205162851 * Version bump ] { hunk ./source/x11/xterm/FrugalBuild 5 -pkgver=222 +pkgver=223 hunk ./source/x11/xterm/FrugalBuild 16 -sha1sums=('bedb7a87f7e0a92471ff7140f0727233aaeb8811') +sha1sums=('8287d0b436b1822ab7545a7dc357af0e243c636b') } From alex at alex-smith.me.uk Tue Dec 5 18:02:27 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Dec 5 18:02:30 2006 Subject: [Frugalware-darcs] frugalware-current: libgnomekbd-2.17.2-1-i686 Message-ID: <20061205170227.D574AFA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205170158-46e39-01fa2d45c13e3ffa4c9f1a114147ff375cc09cdd.gz; [libgnomekbd-2.17.2-1-i686 AlexExtreme **20061205170158 * New package for control-center and gnome-screensaver ] { adddir ./source/gnome/libgnomekbd addfile ./source/gnome/libgnomekbd/FrugalBuild hunk ./source/gnome/libgnomekbd/FrugalBuild 1 +# Compiling time: 0.42 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=libgnomekbd +pkgver=2.17.2 +pkgrel=1 +pkgdesc="Keyboard library for GNOME" +url="http://www.gnome.org/" +depends=('dbus-glib>=0.71-2' 'gconf' 'gtk+2' 'libglade' 'libgnome' 'libgnomeui' 'libxklavier') +makedepends=('intltool' 'perl-xml') +groups=('gnome' 'gnome-core') +archs=('i686' 'x86_64') +_F_gnome_schemas=('desktop_gnome_peripherals_keyboard_xkb.schemas') +Finclude gnome gnome-scriptlet +sha1sums=('3d5f09c91a1eadf7621640a6faaae730ba97dc77') + +# optimization OK } From alex at alex-smith.me.uk Tue Dec 5 19:40:24 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Dec 5 19:40:27 2006 Subject: [Frugalware-darcs] frugalware-current: control-center-2.17.3-1-i686 Message-ID: <20061205184024.C0D40FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205184031-46e39-31cf55a03a4a364bc8170f62695320628c75054c.gz; [control-center-2.17.3-1-i686 AlexExtreme **20061205184031 * Version bump ] { hunk ./source/gnome/control-center/FrugalBuild 5 -pkgver=2.17.1 -pkgrel=2 +pkgver=2.17.3 +pkgrel=1 hunk ./source/gnome/control-center/FrugalBuild 9 -depends=('gnome-desktop>=2.16.1' 'gnome-menus>=2.16.1' 'metacity>=2.17.1' 'libxklavier>=3.1' \ +depends=('gnome-desktop>=2.16.1' 'gnome-menus>=2.16.1' 'metacity>=2.17.1' 'libgnomekbd' \ hunk ./source/gnome/control-center/FrugalBuild 12 - 'libgnome' 'gnome-vfs>=2.16.1') + 'gnome-vfs>=2.16.1' 'gnome-panel>=2.16.0') hunk ./source/gnome/control-center/FrugalBuild 21 - '/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas' hunk ./source/gnome/control-center/FrugalBuild 28 -sha1sums=('1ab90201bb5fdd09458941eb85d097c6a2b0bab3' \ +sha1sums=('cdb3d4e0bd82d661e3c76dd2ee053b650dc469e0' \ } From alex at alex-smith.me.uk Tue Dec 5 20:03:50 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Dec 5 20:04:01 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-screensaver-2.17.3-1-i686 Message-ID: <20061205190350.7067AFA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205190350-46e39-60e89f7c3e44ecd01edbcd514f53689668d48665.gz; [gnome-screensaver-2.17.3-1-i686 AlexExtreme **20061205190350 * Version bump ] { hunk ./source/gnome/gnome-screensaver/FrugalBuild 5 -pkgver=2.17.1 -pkgrel=2 +pkgver=2.17.3 +pkgrel=1 hunk ./source/gnome/gnome-screensaver/FrugalBuild 9 -depends=('libgnomeui>=2.16.0' 'dbus-glib>=0.71' 'gnome-menus>=2.16.1' 'gdm>=2.16.1' \ +depends=('libgnomeui>=2.16.0' 'dbus-glib>=0.71' 'gnome-menus>=2.16.1' 'gdm>=2.16.1' 'libgnomekbd' \ hunk ./source/gnome/gnome-screensaver/FrugalBuild 20 -sha1sums=('9d12c7e9787472baa7ae50b7d94c419275e21917' \ +sha1sums=('4905666b19ef6b51fa81dd68515f37d4d9619ff5' \ } From vmiklos at frugalware.org Tue Dec 5 20:05:02 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 20:05:03 2006 Subject: [Frugalware-darcs] pacman: makepkg: it's normal to have an autogenerated scriptlet, silence warning Message-ID: <20061205190502.9AF49FA4707@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=darcs_commitdiff;h=20061205190357-e2957-93550da167e9f24ff7bc7acd52eb7a3a2dab96e3.gz; [makepkg: it's normal to have an autogenerated scriptlet, silence warning VMiklos **20061205190357] { hunk ./scripts/makepkg 783 -fi -if [ "$install" -a ! -f "$install" ]; then - warning "install scriptlet ($install) does not exist." } From alex at alex-smith.me.uk Tue Dec 5 20:12:51 2006 From: alex at alex-smith.me.uk (AlexExtreme) Date: Tue Dec 5 20:12:54 2006 Subject: [Frugalware-darcs] frugalware-current: gnome-power-manager-2.17.3-1-i686 Message-ID: <20061205191251.E092FFA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205191237-46e39-8af52f7d83fafe353a908565b75629a9eff0d85b.gz; [gnome-power-manager-2.17.3-1-i686 AlexExtreme **20061205191237 * Version bump ] { hunk ./source/gnome/gnome-power-manager/FrugalBuild 5 -pkgver=2.17.2.1 +pkgver=2.17.3 hunk ./source/gnome/gnome-power-manager/FrugalBuild 9 -depends=('libnotify>=0.4.2-4' 'hal>=0.5.7.1-3' 'dbus-glib>=0.71' 'xextproto' 'libgnomeui>=2.16.0' 'libgnome>=2.16.0' \ - 'libglade' 'libwnck>=2.16.0') +depends=('libnotify>=0.4.2-4' 'hal>=0.5.8.1' 'dbus-glib>=0.71' 'xextproto' 'libgnomeui>=2.16.0' 'libgnome>=2.17.0' \ + 'libglade' 'libwnck>=2.16.0' 'gnome-panel>=2.16.0') hunk ./source/gnome/gnome-power-manager/FrugalBuild 20 -sha1sums=('2a568ed7fa7b037848376add7229688f257cac77' \ +sha1sums=('ded8327f154f2edb48602ed5181e3b2267a1ab3e' \ } From krics at linuxforum.hu Tue Dec 5 20:25:10 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 20:25:13 2006 Subject: [Frugalware-darcs] frugalware-current: xorg.sh: do it do it :) 7.2 RC3 URL switch Message-ID: <20061205192510.766FBFA4707@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205192452-d209c-eacf70b6ff0f9d512dc5cbf8d34112f2f4c8de9c.gz; [xorg.sh: do it do it :) 7.2 RC3 URL switch Christian Hamar alias krix **20061205192452 * Temp. switching for 7.2 RC3 directory ] { hunk ./source/include/xorg.sh 26 -dlurl="$url/releases/individual/$_F_xorg_dir/" +#dlurl="$url/releases/individual/$_F_xorg_dir/" +dlurl="http://xorg.freedesktop.org/archive/development/X11R7.2-RC3/everything/" } From krics at linuxforum.hu Tue Dec 5 20:26:52 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 20:26:53 2006 Subject: [Frugalware-darcs] frugalware-current: inputproto-1.3.2-1-x86_64 Message-ID: <20061205192652.A3EA3FA4709@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205192727-d209c-74ffb5165e95d45b625eb4ab26d0ec0d14d7f9f1.gz; [inputproto-1.3.2-1-x86_64 Christian Hamar alias krix **20061205192727 * Downgrade inputproto to 1.3.2 (because of 7.2 RC3) ] { hunk ./source/x11/inputproto/FrugalBuild 5 -pkgver=1.4 +pkgver=1.3.2 hunk ./source/x11/inputproto/FrugalBuild 13 +force="y" hunk ./source/x11/inputproto/FrugalBuild 15 -sha1sums=('020e0bde3719eb28b04add396ca2532b6c5c0082') +sha1sums=('61d83e6d273a71afbec8a5183bd0f1e13b68ad9f') } From krics at linuxforum.hu Tue Dec 5 20:31:47 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 20:31:53 2006 Subject: [Frugalware-darcs] frugalware-current: libdrm-2.3.0-1-x86_64 Message-ID: <20061205193147.E8C45FA4707@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205193106-d209c-4898ce29235cbbb2939175d18ed28b72245bb802.gz; [libdrm-2.3.0-1-x86_64 Christian Hamar alias krix **20061205193106 * Version bump (7.2 RC3) ] { hunk ./source/x11/libdrm/FrugalBuild 5 -pkgver=2.0.2 +pkgver=2.3.0 hunk ./source/x11/libdrm/FrugalBuild 7 -pkgdesc="X.Org libdrm library" +pkgdesc="X.Org Userspace interface to kernel DRM services" hunk ./source/x11/libdrm/FrugalBuild 14 -sha1sums=('99f406e2bbc6ee1f87e32d0c815ba8b6454fed1d') +sha1sums=('fd62459b11c39a58e5b45b8af30a8217d5ce0e1b') } From krics at linuxforum.hu Tue Dec 5 20:38:12 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 20:38:41 2006 Subject: [Frugalware-darcs] frugalware-current: libpthread-stubs-0.1-1-x86_64 Message-ID: <20061205193812.9A3C7FA4707@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205193649-d209c-efbf7bea427b8c26b5dbd039d557c4f2bebb2920.gz; [libpthread-stubs-0.1-1-x86_64 Christian Hamar alias krix **20061205193649 * New package for XCB* ] { adddir ./source/x11/libpthread-stubs addfile ./source/x11/libpthread-stubs/FrugalBuild hunk ./source/x11/libpthread-stubs/FrugalBuild 1 +# Compiling Time: 0.01 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=libpthread-stubs +pkgver=0.1 +pkgrel=1 +pkgdesc="X.org Stubs missing from libc for standard pthread functions" +url="http://xcb.freedesktop.org" +groups=('x11' 'xorg-core' 'xorg-proto') +depends=('glibc') +archs=('i686' 'x86_64') +up2date=("lynx -dump 'http://xcb.freedesktop.org/dist/?C=M;O=A' | grep libpthread-stubs | Flasttar") +source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2) +sha1sums=('34ef40880d0112dc6d32b386d59ce94f2c139eef') } From vmiklos at frugalware.org Tue Dec 5 20:38:15 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 20:38:43 2006 Subject: [Frugalware-darcs] frugalware-current: gphoto2-2.3.0-1-i686 Message-ID: <20061205193819.BCEB7FA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205193715-e2957-5e641f2143f593c07edf20784972b7251db5b890.gz; [gphoto2-2.3.0-1-i686 VMiklos **20061205193715 version bump use Finclude sourceforge ] { hunk ./source/multimedia/gphoto2/FrugalBuild 5 -pkgver=2.2.0 -pkgrel=2 +pkgver=2.3.0 +pkgrel=1 hunk ./source/multimedia/gphoto2/FrugalBuild 8 +_F_sourceforge_dirname="gphoto" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/multimedia/gphoto2/FrugalBuild 17 -source=(http://heanet.dl.sourceforge.net/gphoto/$pkgname-$pkgver.tar.bz2) -sha1sums=('1221864cbacc79248dfc54d21624c49de2710b70') hunk ./source/multimedia/gphoto2/FrugalBuild 19 +sha1sums=('0732c35a19df3142c7cc70e91568bec937b96712') } From krics at linuxforum.hu Tue Dec 5 20:46:22 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 20:46:31 2006 Subject: [Frugalware-darcs] frugalware-current: xcb-proto-1.0-1-x86_64 Message-ID: <20061205194622.2D1D9FA470B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205194559-d209c-16ebc2ef41b5d6191fdcbd490a5284fa46070bc6.gz; [xcb-proto-1.0-1-x86_64 Christian Hamar alias krix **20061205194559 * New package for 7.2 RC3 ] { adddir ./source/x11/xcb-proto addfile ./source/x11/xcb-proto/FrugalBuild hunk ./source/x11/xcb-proto/FrugalBuild 1 +# Compiling Time: 0.01 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=xcb-proto +pkgver=1.0 +pkgrel=1 +pkgdesc="X.org X protocol descriptions for XCB" +url="http://xcb.freedesktop.org" +groups=('x11' 'xorg-core' 'xorg-proto') +depends=() +archs=('i686' 'x86_64') +makedepends=('pkgconfig' 'libxml2') +up2date=("lynx -dump 'http://xcb.freedesktop.org/dist/?C=M;O=A' | grep xcb-proto | Flasttar") +source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2) +sha1sums=('c7252cc74f75c997227b4dcdba2cb654d89cecda') } From krics at linuxforum.hu Tue Dec 5 20:49:50 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 20:49:52 2006 Subject: [Frugalware-darcs] frugalware-current: libxcb-1.0-1-x86_64 Message-ID: <20061205194950.CE5FDFA470B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205195003-d209c-897c0fe7d5626fe5697fc7eb92e8c20228d8d4ce.gz; [libxcb-1.0-1-x86_64 Christian Hamar alias krix **20061205195003 * New package for 7.2 RC3 xorg ] { adddir ./source/x11/libxcb addfile ./source/x11/libxcb/FrugalBuild hunk ./source/x11/libxcb/FrugalBuild 1 +# Compiling Time: 0.43 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=libxcb +pkgver=1.0 +pkgrel=1 +pkgdesc="X.org X-protocol C Binding" +url="http://xcb.freedesktop.org" +groups=('x11' 'xorg-core' 'xorg-proto') +depends=('xcb-proto>=1.0' 'libpthread-stubs' 'libxml2' 'libxau' 'libxdmcp' 'libxslt') +archs=('i686' 'x86_64') +makedepends=('pkgconfig') +up2date=("lynx -dump 'http://xcb.freedesktop.org/dist/?C=M;O=A' | grep libxcb | Flasttar") +source=(http://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2) +sha1sums=('0a7e0b65e6f1e0ef4dcaecaa01c4b2854206e96e') + +build() { + Fbuild + Fmv /usr/share/doc/$pkgname/tutorial /usr/share/doc/$pkgname-$pkgver/ +} + +# optimization OK } From krics at linuxforum.hu Tue Dec 5 20:52:39 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 20:52:45 2006 Subject: [Frugalware-darcs] frugalware-current: util-macros-1.1.3-1-x86_64 Message-ID: <20061205195240.0F1E0FA470C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205195241-d209c-00e3798f53f9782ba730b821f2e31fd6c78e2bf3.gz; [util-macros-1.1.3-1-x86_64 Christian Hamar alias krix **20061205195241 * Version bump ] { hunk ./source/x11/util-macros/FrugalBuild 5 -pkgver=1.1.1 +pkgver=1.1.3 hunk ./source/x11/util-macros/FrugalBuild 14 -sha1sums=('c1ad23bbdd3c087e061000ae998401b671686406') +sha1sums=('333e9cb77fea35231cc9aac23a5cbc21f81ca867') } From krics at linuxforum.hu Tue Dec 5 20:59:18 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 20:59:28 2006 Subject: [Frugalware-darcs] frugalware-current: compositeproto-0.3.1-1-x86_64 Message-ID: <20061205195918.7C1FFFA470E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205195842-d209c-28a0f84367563430b14725375d78ff7cb11e1f2b.gz; [compositeproto-0.3.1-1-x86_64 Christian Hamar alias krix **20061205195842 * Version bump ] { hunk ./source/x11/compositeproto/FrugalBuild 5 -pkgver=0.3 +pkgver=0.3.1 hunk ./source/x11/compositeproto/FrugalBuild 7 -pkgdesc="X.Org composite protocol headers" +pkgdesc="X.Org Composite extension headers" hunk ./source/x11/compositeproto/FrugalBuild 14 -sha1sums=('7e517a4ecb5059036e38063bce9281f03464b407') +sha1sums=('fc89dfc3f92628e437f2f45286d00e92530768a8') } From krics at linuxforum.hu Tue Dec 5 21:04:17 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 21:04:36 2006 Subject: [Frugalware-darcs] frugalware-current: font-screen-cyrillic-1.0.1-1-x86_64 Message-ID: <20061205200417.35D6DFA4709@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205200325-d209c-70a0e46bef6260c9294114d78031cb4ae00a7c93.gz; [font-screen-cyrillic-1.0.1-1-x86_64 Christian Hamar alias krix **20061205200325 * Version bump * Makedepends on latest util-macros ] { hunk ./source/x11/font-screen-cyrillic/FrugalBuild 5 -pkgver=1.0.0 +pkgver=1.0.1 hunk ./source/x11/font-screen-cyrillic/FrugalBuild 12 -makedepends=('pkgconfig' 'bdftopcf') +makedepends=('pkgconfig' 'bdftopcf' 'util-macros>=1.1.3') hunk ./source/x11/font-screen-cyrillic/FrugalBuild 16 +sha1sums=('d6eb7c366ab1cb8198df93aa661f295ebe09669f' \ + '84d377ebafea8d3df2d9076119f1f669bdc1b860') hunk ./source/x11/font-screen-cyrillic/FrugalBuild 27 -# optimalization OK - -# vim: ft=sh -sha1sums=('f6e02e5f8edc7a40051dc08739929bc8ac75e7d3' \ - '84d377ebafea8d3df2d9076119f1f669bdc1b860') - } From krics at linuxforum.hu Tue Dec 5 21:14:48 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 21:14:55 2006 Subject: [Frugalware-darcs] frugalware-current: xkeyboard-config-0.9-1-x86_64 Message-ID: <20061205201448.C7B93FA4709@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205201428-d209c-5532c9c2aec4d6b444489d64305ff4df9b4080a4.gz; [xkeyboard-config-0.9-1-x86_64 Christian Hamar alias krix **20061205201428 * New package (replacement for xkbdata) ] { adddir ./source/x11/xkeyboard-config addfile ./source/x11/xkeyboard-config/FrugalBuild hunk ./source/x11/xkeyboard-config/FrugalBuild 1 +# Compiling Time: 0.01 SBU +# Maintainer: Christian Hamar alias krix + +pkgname=xkeyboard-config +pkgver=0.9 +pkgrel=1 +pkgdesc="X.org XML-based XKB configuration registry" +url="http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig" +groups=('x11' 'xorg-core' 'xorg-proto') +depends=('xkbcomp') +provides=('xkbdata') +replaces=('xkbdata') +conflicts=('xkbdata') +archs=('i686' 'x86_64') +makedepends=('pkgconfig' 'perl-xml') +up2date=("lynx -dump 'http://xlibs.freedesktop.org/xkbdesc/?C=M;O=A' | grep $pkgname | Flasttar") +source=(http://xlibs.freedesktop.org/xkbdesc/$pkgname-$pkgver.tar.bz2) +sha1sums=('05139163da656001fd837c6678254665c0d8ca00') +Fconfopts="$Fconfopts --enable-xkbcomp-symlink --enable-compat-rules --with-xkb-rules-symlink=xorg,xfree86" } From krics at linuxforum.hu Tue Dec 5 21:19:35 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 21:19:39 2006 Subject: [Frugalware-darcs] frugalware-current: xorg-sgml-doctools-1.1.1-1-x86_64 Message-ID: <20061205201935.5C83AFA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205201908-d209c-727723c1975e640bd66fc4b10b7336d940f0696f.gz; [xorg-sgml-doctools-1.1.1-1-x86_64 Christian Hamar alias krix **20061205201908 * Version bump ] { hunk ./source/x11/xorg-sgml-doctools/FrugalBuild 5 -pkgver=1.1 +pkgver=1.1.1 hunk ./source/x11/xorg-sgml-doctools/FrugalBuild 13 -sha1sums=('f9bb1f5e324e7687a221cdd34387db39a94b3396') +sha1sums=('c8199c214be2ebc62407d0f5347f30d1346f6781') } From krics at linuxforum.hu Tue Dec 5 21:26:56 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 21:27:03 2006 Subject: [Frugalware-darcs] frugalware-current: xorg-docs-1.3-1-x86_64 Message-ID: <20061205202656.F3D00FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205202634-d209c-b2b5a7c4f5f0d198a3bf420bba62dcd964545a05.gz; [xorg-docs-1.3-1-x86_64 Christian Hamar alias krix **20061205202634 * Version bump ] { hunk ./source/x11/xorg-docs/FrugalBuild 5 -pkgver=1.2 +pkgver=1.3 hunk ./source/x11/xorg-docs/FrugalBuild 12 -makedepends=('xorg-sgml-doctools>=1.1') +makedepends=('xorg-sgml-doctools>=1.1.1') hunk ./source/x11/xorg-docs/FrugalBuild 14 -sha1sums=('867de1f1bc07faaf58fdc8bb7f8b215a7e272f61') +sha1sums=('a82634e02a26e7d3b440f67d3481a599c7990cfc') } From krics at linuxforum.hu Tue Dec 5 21:34:01 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 21:34:16 2006 Subject: [Frugalware-darcs] frugalware-current: libx11-1.1.1-1-x86_64 Message-ID: <20061205203401.BEB05FA4709@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205203255-d209c-e1a614ef11250f5e3d643731a904946f946fab8d.gz; [libx11-1.1.1-1-x86_64 Christian Hamar alias krix **20061205203255 * Version bump (7.2 RC3) ] { hunk ./source/x11/libx11/686bb8b35acf6cecae80fe89b2b5853f5816ce19.diff 1 -From: Matthias Hopf -Date: Wed, 18 Oct 2006 12:25:04 +0000 (+0200) -Subject: Fix double open of compose file. -X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=commitdiff;h=686bb8b35acf6cecae80fe89b2b5853f5816ce19 - -Fix double open of compose file. - -Issue found by Kees Cook . ---- - ---- a/modules/im/ximcp/imLcIm.c -+++ b/modules/im/ximcp/imLcIm.c -@@ -617,7 +617,6 @@ _XimCreateDefaultTree( - } - #endif - -- fp = _XFopenFile (name, "r"); - if (! (fp = _XFopenFile (name, "r"))) { - if (tmpcachedir) - Xfree (tmpcachedir); rmfile ./source/x11/libx11/686bb8b35acf6cecae80fe89b2b5853f5816ce19.diff hunk ./source/x11/libx11/FrugalBuild 6 -pkgver=1.0.99.1 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 hunk ./source/x11/libx11/FrugalBuild 12 -depends=('xproto' 'libxdmcp' 'xtrans>=1.0.2' 'kbproto' 'libxau') +depends=('xproto' 'libxdmcp' 'xtrans>=1.0.2' 'kbproto' 'libxau' 'libxcb>=1.0') hunk ./source/x11/libx11/FrugalBuild 14 - 'xextproto' 'xcmiscproto' 'inputproto' 'util-macros') + 'xextproto' 'xcmiscproto' 'inputproto=1.3.2' 'util-macros>=1.1.3') hunk ./source/x11/libx11/FrugalBuild 16 -source=($source 686bb8b35acf6cecae80fe89b2b5853f5816ce19.diff) hunk ./source/x11/libx11/FrugalBuild 17 -Fconfopts="$Fconfopts --enable-ipv6 --enable-xlocaledir --enable-xlocale --with-xcb=no" +Fconfopts="$Fconfopts --enable-ipv6 --enable-xlocaledir --enable-xlocale --with-xcb=yes" +sha1sums=('048dc3d850666010e81a86bbe0960a643557251a') + hunk ./source/x11/libx11/FrugalBuild 21 -sha1sums=('6f6a2c05359c557207c49a2ddfec53a54c6a8610' \ - 'df96b8aa9fb4333c010f6b15c39b5a694e9e26a0') } From krics at linuxforum.hu Tue Dec 5 21:43:20 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 21:43:30 2006 Subject: [Frugalware-darcs] frugalware-current: libxt-1.0.4-1-x86_64 Message-ID: <20061205204320.A11B5FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205204219-d209c-f5153882f0866e0199d3070da55a274f9cfa3431.gz; [libxt-1.0.4-1-x86_64 Christian Hamar alias krix **20061205204219 * Version bump ] { hunk ./source/x11/libxt/FrugalBuild 6 -pkgver=1.0.3 +pkgver=1.0.4 hunk ./source/x11/libxt/FrugalBuild 12 -depends=('libx11>=1.0.99.1' 'libsm>=1.0.2' 'xproto') +depends=('libx11>=1.1.1' 'libsm>=1.0.2' 'xproto') hunk ./source/x11/libxt/FrugalBuild 15 -sha1sums=('65d40e3ea93652aba9aaea845d15b6aef0710186') +sha1sums=('3a7d7d390214876c925d5226ef3949b6c5bad6ce') } From vmiklos at frugalware.org Tue Dec 5 21:47:39 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 21:47:47 2006 Subject: [Frugalware-darcs] frugalware-current: gpar2-0.3-1-i686 Message-ID: <20061205204739.4D754FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205190815-e2957-d28f73e68f77d4703fb00f587709fe12e1b04886.gz; [gpar2-0.3-1-i686 VMiklos **20061205190815 use Finclude sourceforge ] { hunk ./source/gnome-extra/gpar2/FrugalBuild 8 +_F_sourceforge_dirname="parchive" +Finclude sourceforge hunk ./source/gnome-extra/gpar2/FrugalBuild 18 -source=(http://heanet.dl.sourceforge.net/sourceforge/parchive/$pkgname-$pkgver.tar.gz) hunk ./source/gnome-extra/gpar2/FrugalBuild 23 - Ffilerel gpar2.desktop usr/share/applications/gpar2.desktop + Ffilerel /usr/share/applications/gpar2.desktop } From vmiklos at frugalware.org Tue Dec 5 21:47:39 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 21:47:50 2006 Subject: [Frugalware-darcs] frugalware-current: gnomebaker-0.6.0-2-i686 Message-ID: <20061205204740.61278FA4709@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205190630-e2957-749177f46c08baafd75bfd95581186e9fb1b68f1.gz; [gnomebaker-0.6.0-2-i686 VMiklos **20061205190630 use Finclude sourceforge ] { hunk ./source/gnome-extra/gnomebaker/FrugalBuild 8 +_F_gnome_scrollkeeper="y" +_F_gnome_iconcache="y" +Finclude gnome-scriptlet sourceforge hunk ./source/gnome-extra/gnomebaker/FrugalBuild 18 -source=(http://heanet.dl.sourceforge.net/sourceforge/gnomebaker/$pkgname-$pkgver.tar.gz) hunk ./source/gnome-extra/gnomebaker/FrugalBuild 19 -_F_gnome_scrollkeeper="y" -_F_gnome_iconcache="y" -Finclude gnome-scriptlet } From vmiklos at frugalware.org Tue Dec 5 21:47:41 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 21:47:51 2006 Subject: [Frugalware-darcs] frugalware-current: graphicsmagick-1.1.7-2-i686 Message-ID: <20061205204741.6C755FA470F@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205202748-e2957-1bb285d105ca474aebf3ab365b7600c0ee0bc3b4.gz; [graphicsmagick-1.1.7-2-i686 VMiklos **20061205202748 inherit source from sourceforge.sh ] { hunk ./source/xapps-extra/graphicsmagick/FrugalBuild 11 +_F_sourceforge_dirname="$pkgname" +_F_sourceforge_name="GraphicsMagick" +_F_sourceforge_ext=".tar.bz2" hunk ./source/xapps-extra/graphicsmagick/FrugalBuild 15 -source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/GraphicsMagick-$pkgver.tar.bz2 \ - graphicsmagick-1.1.7-overflow.patch0 \ +source=($source graphicsmagick-1.1.7-overflow.patch0 \ } From vmiklos at frugalware.org Tue Dec 5 21:47:41 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 21:47:52 2006 Subject: [Frugalware-darcs] frugalware-current: courier-maildrop-2.0.2-1-i686 Message-ID: <20061205204741.BE4C6FA4711@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205190056-e2957-d7cf7c5d961402bc97fb6762ef2bf79dfa7d9258.gz; [courier-maildrop-2.0.2-1-i686 VMiklos **20061205190056 use Finclude sourceforge ] { hunk ./source/network-extra/courier-maildrop/FrugalBuild 8 +_F_sourceforge_dirname="courier" +_F_sourceforge_name="maildrop" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/network-extra/courier-maildrop/FrugalBuild 18 -source=(http://heanet.dl.sourceforge.net/sourceforge/courier/maildrop-$pkgver.tar.bz2) } From vmiklos at frugalware.org Tue Dec 5 21:47:40 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 21:47:54 2006 Subject: [Frugalware-darcs] frugalware-current: cssed-0.4.0-1-i686 Message-ID: <20061205204740.EAE15FA470E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205190224-e2957-9952c5a9819253aa1a1729c249ded4f5ee6ddb66.gz; [cssed-0.4.0-1-i686 VMiklos **20061205190224 use Finclude sourceforge ] { hunk ./source/gnome-extra/cssed/FrugalBuild 8 +Finclude sourceforge hunk ./source/gnome-extra/cssed/FrugalBuild 14 -source=(http://heanet.dl.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \ - cssed.desktop) +source=($source cssed.desktop) hunk ./source/gnome-extra/cssed/FrugalBuild 21 - install -D -m644 $startdir/src/$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop + Ffile /usr/share/applications/$pkgname.desktop hunk ./source/gnome-extra/cssed/FrugalBuild 24 -# vim: ft=sh - -# optimalization OK +# optimization OK } From vmiklos at frugalware.org Tue Dec 5 21:47:42 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 21:47:55 2006 Subject: [Frugalware-darcs] frugalware-current: gtk+extra-2.1.1-1-i686 Message-ID: <20061205204742.D754BFA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205202841-e2957-51fefecd05c0d2bda889d3d73b6f94e41b43970f.gz; [gtk+extra-2.1.1-1-i686 VMiklos **20061205202841 use Finclude sourceforge ] { hunk ./source/xlib-extra/gtk+extra/FrugalBuild 8 +_F_sourceforge_dirname="scigraphica" +Finclude sourceforge hunk ./source/xlib-extra/gtk+extra/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/scigraphica/$pkgname-$pkgver.tar.gz) hunk ./source/xlib-extra/gtk+extra/FrugalBuild 18 -# optimalization OK +# optimization OK } From krics at linuxforum.hu Tue Dec 5 21:50:35 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 21:50:38 2006 Subject: [Frugalware-darcs] frugalware-current: libxmu-1.0.3-1-x86_64 Message-ID: <20061205205035.2BFFBFA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205204945-d209c-24aacc14b21a4223a35a0be12e53d2a233310157.gz; [libxmu-1.0.3-1-x86_64 Christian Hamar alias krix **20061205204945 * Version bump ] { hunk ./source/x11/libxmu/FrugalBuild 6 -pkgver=1.0.2 +pkgver=1.0.3 hunk ./source/x11/libxmu/FrugalBuild 12 -depends=('libx11' 'libxt' 'libxext') +depends=('libx11>=1.1.1' 'libxt>=1.0.4' 'libxext') hunk ./source/x11/libxmu/FrugalBuild 15 -sha1sums=('2a12c80c62916eca954a0d7802413d7cc754e7ab') +sha1sums=('7f2baa63b68ff8bdb524f3d5a2643066a556973b') } From krics at linuxforum.hu Tue Dec 5 21:57:02 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 21:57:15 2006 Subject: [Frugalware-darcs] frugalware-current: libxfont-1.2.5-1-x86_64 Message-ID: <20061205205703.3ED6CFA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205205528-d209c-b148247e2c15f9711344c79511be2257b429516c.gz; [libxfont-1.2.5-1-x86_64 Christian Hamar alias krix **20061205205528 * Version bump ] { hunk ./source/x11/libxfont/FrugalBuild 6 -pkgver=1.2.3 +pkgver=1.2.5 hunk ./source/x11/libxfont/FrugalBuild 15 -sha1sums=('97aed7a88c43086a816a3586d08e9ed17411d6d9') +sha1sums=('d30d9ea313ea8cee02bcfca960d3987411e4d8a1') hunk ./source/x11/libxfont/FrugalBuild 18 ---enable-pcfformat --enable-bdfformat --enable-snfformat --enable-cid" +--enable-pcfformat --enable-bdfformat --enable-snfformat" } From krics at linuxforum.hu Tue Dec 5 22:03:55 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 22:04:04 2006 Subject: [Frugalware-darcs] frugalware-current: libxfixes-4.0.3-1-x86_64 Message-ID: <20061205210355.AF9A0FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205210308-d209c-5294983831d456bf023ca712afa4a7f70a93795b.gz; [libxfixes-4.0.3-1-x86_64 Christian Hamar alias krix **20061205210308 * VErsion bump ] { hunk ./source/x11/libxfixes/FrugalBuild 6 -pkgver=4.0 +pkgver=4.0.3 hunk ./source/x11/libxfixes/FrugalBuild 12 -depends=('libx11' 'fixesproto>=4.0' 'xproto' 'xextproto') +depends=('libx11>=1.1.1' 'fixesproto>=4.0' 'xproto' 'xextproto') hunk ./source/x11/libxfixes/FrugalBuild 15 -sha1sums=('bbbf4384d3782193f3ea680747bef468b93c997b') +sha1sums=('37297e64239e1cc2a7b4372e27c5f9325f9f29dc') } From krics at linuxforum.hu Tue Dec 5 22:08:23 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 22:08:35 2006 Subject: [Frugalware-darcs] frugalware-current: libxcomposite-0.3.1-1-x86_64 Message-ID: <20061205210823.68E32FA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205210747-d209c-bd5180fb3b5aceb6661de482732f7ff6643e0dd2.gz; [libxcomposite-0.3.1-1-x86_64 Christian Hamar alias krix **20061205210747 * Version bump ] { hunk ./source/x11/libxcomposite/FrugalBuild 6 -pkgver=0.3 +pkgver=0.3.1 hunk ./source/x11/libxcomposite/FrugalBuild 12 -depends=('libx11' 'libxfixes' 'libxext' 'compositeproto' 'xproto') -makedepends=('pkgconfig' 'inputproto') +depends=('libx11>=1.1.1' 'libxfixes>=4.0.3' 'libxext' 'compositeproto>=0.3.1' 'xproto') +makedepends=('pkgconfig' 'inputproto=1.3.2') hunk ./source/x11/libxcomposite/FrugalBuild 16 -sha1sums=('7367c444ab0f76e415d6822ded6d9bf6454f5d09') +sha1sums=('d5c7883f1d3a98e0fd055226b2a1d4b6ffe5ca54') } From krics at linuxforum.hu Tue Dec 5 22:13:09 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 22:13:18 2006 Subject: [Frugalware-darcs] frugalware-current: sessreg-1.0.2-1-x86_64 Message-ID: <20061205211312.29891FA470E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205211239-d209c-9eedb6cce42d16a18d5449b34d30f2ff101cb1bd.gz; [sessreg-1.0.2-1-x86_64 Christian Hamar alias krix **20061205211239 * Version bump ] { hunk ./source/x11/sessreg/FrugalBuild 5 -pkgver=1.0.0 +pkgver=1.0.2 hunk ./source/x11/sessreg/FrugalBuild 12 -makedepends=('xproto' 'inputproto') +makedepends=('xproto' 'inputproto' 'libx11>=1.1.1' 'util-macros>=1.1.3') hunk ./source/x11/sessreg/FrugalBuild 14 +sha1sums=('2f2a36967ecffb29461ae28def3b013955e584dd') hunk ./source/x11/sessreg/FrugalBuild 16 -# optimalization OK - -# vim: ft=sh -sha1sums=('2a583836ad049fe49bc4b968e63257ece676705b') +# optimization OK } From krics at linuxforum.hu Tue Dec 5 22:18:30 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 22:18:38 2006 Subject: [Frugalware-darcs] frugalware-current: twm-1.0.3-1-x86_64 Message-ID: <20061205211830.6CD57FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205211706-d209c-b0d9471fa7cd3429758d54023ff95f3fd0f5ac1e.gz; [twm-1.0.3-1-x86_64 Christian Hamar alias krix **20061205211706 * Version bump ] { hunk ./source/x11/twm/FrugalBuild 5 -pkgver=1.0.2 +pkgver=1.0.3 hunk ./source/x11/twm/FrugalBuild 11 -depends=('libx11>=1.0.99.1' 'libxt>=1.0.3' 'libxmu') +depends=('libx11>=1.1.1' 'libxt' 'libxmu') hunk ./source/x11/twm/FrugalBuild 14 -sha1sums=('9c7ac49c4db26d638312ca9cfe763d11c78a6ef0') +sha1sums=('8e3724f53f8796359705d8e4ff334608bc887f64') } From krics at linuxforum.hu Tue Dec 5 22:23:42 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 22:23:50 2006 Subject: [Frugalware-darcs] frugalware-current: xfs-1.0.4-1-x86_64 Message-ID: <20061205212342.EB073FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205212227-d209c-f36189d2522b7e5302c56598483698f439cb4be4.gz; [xfs-1.0.4-1-x86_64 Christian Hamar alias krix **20061205212227 * Version bump ] { hunk ./source/x11/xfs/FrugalBuild 5 -pkgver=1.0.3 +pkgver=1.0.4 hunk ./source/x11/xfs/FrugalBuild 11 -depends=('libfs' 'libxfont>=1.2.3') +depends=('libfs' 'libxfont>=1.2.5') hunk ./source/x11/xfs/FrugalBuild 13 -sha1sums=('8ea09473255f02b8c902eb93774c3c77ec877775') +sha1sums=('5c3f82746141250c49d57b5075c3e3ec42e2fd1d') } From krics at linuxforum.hu Tue Dec 5 22:34:06 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 22:34:19 2006 Subject: [Frugalware-darcs] frugalware-current: mesa-6.5.2-1-x86_64 Message-ID: <20061205213407.25D34FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205213303-d209c-0539bb5d0ece3f2901f8fc8c8d80ff8f4cd4fd39.gz; [mesa-6.5.2-1-x86_64 Christian Hamar alias krix **20061205213303 * Version bump * Removed i965 patch (in upstream) * Reworked build-config patch ] { hunk ./source/x11/mesa/FrugalBuild 7 -pkgver=6.5.1 -pkgrel=3 +pkgver=6.5.2 +pkgrel=1 hunk ./source/x11/mesa/FrugalBuild 12 -depends=('expat' 'libx11' 'libxext' 'libxxf86vm' 'libxi' 'libxmu' 'libice' 'libdrm' 'libgl') +depends=('expat' 'libx11>=1.1.1' 'libxext' 'libxxf86vm' 'libxi' 'libxmu>=1.0.3' 'libice' 'libdrm>=2.3.0' 'libgl') hunk ./source/x11/mesa/FrugalBuild 20 - post-6.5.1-i965-fixes.patch \ hunk ./source/x11/mesa/FrugalBuild 21 -sha1sums=('cd3b314808534b0306c7f89e9a72c9c23dbff239' \ +sha1sums=('ba860bb6ee57c02202342dfd5927464a068ea18f' \ hunk ./source/x11/mesa/FrugalBuild 25 - '9141ecfa0f9dd8290b6fce840920af181c3deb87' \ - 'aa4926e039e394bd784fa92ecb86f58344a49110') + 'b49bb4f22426fd0dab7551ef8907276214c9a3fa') hunk ./source/x11/mesa/FrugalBuild 30 -subdepends=('libxxf86vm libdrm') +subdepends=('libxxf86vm libdrm>=2.3.0') hunk ./source/x11/mesa/FrugalBuild 63 - cp -r docs/{README.*,*.html,RELNOTES-6.5,COPYING} \ + cp -r docs/{README.*,*.html,COPYING} \ hunk ./source/x11/mesa/FrugalBuild 72 - Fln libGLU.so.1.3.060501 /usr/lib/libGLU.so.1.3 + Fln libGLU.so.1.3.060502 /usr/lib/libGLU.so.1.3 hunk ./source/x11/mesa/FrugalBuild 75 + # Remove glut.h because it conflicts with freeglut :P + Frm /usr/include/GL/glut.h + hunk ./source/x11/mesa/mesa-build-config.patch 61 --DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300 -+DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 +-DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 ++DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 hunk ./source/x11/mesa/post-6.5.1-i965-fixes.patch 1 -diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile -index e4fb451..dfa9318 100644 ---- a/src/mesa/drivers/dri/i965/Makefile -+++ b/src/mesa/drivers/dri/i965/Makefile -@@ -16,6 +16,7 @@ DRIVER_SOURCES = \ - intel_regions.c \ - intel_screen.c \ - intel_span.c \ -+ intel_pixel_copy.c \ - intel_state.c \ - intel_tex.c \ - intel_tex_validate.c \ -diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c -index f12fb4c..e476b18 100644 ---- a/src/mesa/drivers/dri/i965/brw_draw.c -+++ b/src/mesa/drivers/dri/i965/brw_draw.c -@@ -328,6 +328,7 @@ static GLboolean brw_try_draw_prims( GLc - brw_emit_prim(brw, &prim[i]); - } - -+ intel->need_flush = GL_TRUE; - retval = GL_TRUE; - } - -@@ -400,7 +401,7 @@ GLboolean brw_draw_prims( GLcontext *ctx - retval = brw_try_draw_prims(ctx, arrays, prim, nr_prims, ib, min_index, max_index, flags); - } - -- if (intel->aub_file) { -+ if (intel->aub_file && (INTEL_DEBUG & DEBUG_SYNC)) { - intelFinish( &intel->ctx ); - intel->aub_wrap = 1; - } -diff --git a/src/mesa/drivers/dri/i965/brw_exec_api.c b/src/mesa/drivers/dri/i965/brw_exec_api.c -index ca012db..470fa6f 100644 ---- a/src/mesa/drivers/dri/i965/brw_exec_api.c -+++ b/src/mesa/drivers/dri/i965/brw_exec_api.c -@@ -394,7 +394,7 @@ static void GLAPIENTRY brw_exec_EvalCoor - - for (i = 0 ; i <= BRW_ATTRIB_INDEX ; i++) { - if (exec->eval.map1[i].map) -- if (exec->vtx.attrsz[i] != exec->eval.map1[i].sz) -+ if (exec->vtx.active_sz[i] != exec->eval.map1[i].sz) - brw_exec_fixup_vertex( ctx, i, exec->eval.map1[i].sz ); - } - } -diff --git a/src/mesa/drivers/dri/i965/brw_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c -index d70b2ea..8332d86 100644 ---- a/src/mesa/drivers/dri/i965/brw_tex.c -+++ b/src/mesa/drivers/dri/i965/brw_tex.c -@@ -49,34 +49,57 @@ #include "brw_defines.h" - - static const struct gl_texture_format * - brwChooseTextureFormat( GLcontext *ctx, GLint internalFormat, -- GLenum format, GLenum type ) -+ GLenum srcFormat, GLenum srcType ) - { - switch ( internalFormat ) { - case 4: - case GL_RGBA: - case GL_COMPRESSED_RGBA: -+ if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV) -+ return &_mesa_texformat_argb4444; -+ else if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV) -+ return &_mesa_texformat_argb1555; -+ else if ((srcFormat == GL_RGBA && srcType == GL_UNSIGNED_INT_8_8_8_8_REV) || -+ (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) || -+ (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_INT_8_8_8_8)) -+ return &_mesa_texformat_rgba8888_rev; -+ else -+ return &_mesa_texformat_argb8888; -+ - case GL_RGBA8: - case GL_RGB10_A2: - case GL_RGBA12: - case GL_RGBA16: -- case GL_RGBA4: -- case GL_RGBA2: -- case GL_RGB5_A1: - return &_mesa_texformat_argb8888; --/* return &_mesa_texformat_rgba8888_rev; */ - -- case 3: -- case GL_RGB: -- case GL_COMPRESSED_RGB: - case GL_RGB8: - case GL_RGB10: - case GL_RGB12: - case GL_RGB16: -+ /* Broadwater doesn't support RGB888 textures, so these must be -+ * stored as ARGB. -+ */ -+ return &_mesa_texformat_argb8888; -+ -+ case 3: -+ case GL_COMPRESSED_RGB: -+ case GL_RGB: -+ if (srcFormat == GL_RGB && -+ srcType == GL_UNSIGNED_SHORT_5_6_5) -+ return &_mesa_texformat_rgb565; -+ else -+ return &_mesa_texformat_argb8888; -+ -+ - case GL_RGB5: -- case GL_RGB4: -+ case GL_RGB5_A1: -+ return &_mesa_texformat_argb1555; -+ - case GL_R3_G3_B2: --/* return &_mesa_texformat_rgb888; */ -- return &_mesa_texformat_argb8888; -+ case GL_RGBA2: -+ case GL_RGBA4: -+ case GL_RGB4: -+ return &_mesa_texformat_argb4444; - - case GL_ALPHA: - case GL_ALPHA4: -@@ -115,8 +138,8 @@ brwChooseTextureFormat( GLcontext *ctx, - return &_mesa_texformat_i8; - - case GL_YCBCR_MESA: -- if (type == GL_UNSIGNED_SHORT_8_8_MESA || -- type == GL_UNSIGNED_BYTE) -+ if (srcType == GL_UNSIGNED_SHORT_8_8_MESA || -+ srcType == GL_UNSIGNED_BYTE) - return &_mesa_texformat_ycbcr; - else - return &_mesa_texformat_ycbcr_rev; -diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c -index f8aa068..1353325 100644 ---- a/src/mesa/drivers/dri/i965/brw_tex_layout.c -+++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c -@@ -138,13 +138,16 @@ GLboolean brw_miptree_layout( struct int - - /* Layout_below: step right after second mipmap. - */ -- if (level == mt->first_level + 1) -+ if (level == mt->first_level + 1) { - x += mt->pitch / 2; -+ x = (x + 3) & ~ 3; -+ } - else { - y += img_height; -+ y += align_h - 1; -+ y &= ~(align_h - 1); - } - -- - width = minify(width); - height = minify(height); - } -diff --git a/src/mesa/drivers/dri/i965/brw_util.c b/src/mesa/drivers/dri/i965/brw_util.c -index 5957b71..9d12c26 100644 ---- a/src/mesa/drivers/dri/i965/brw_util.c -+++ b/src/mesa/drivers/dri/i965/brw_util.c -@@ -98,6 +98,8 @@ static GLuint brw_parameter_state_flags( - switch (state[1]) { - case STATE_NORMAL_SCALE: - return _NEW_MODELVIEW; -+ case STATE_TEXRECT_SCALE: -+ return _NEW_TEXTURE; - default: - assert(0); - return 0; -diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h -index 74c3bbe..ec6ad61 100644 ---- a/src/mesa/drivers/dri/i965/brw_wm.h -+++ b/src/mesa/drivers/dri/i965/brw_wm.h -@@ -167,6 +167,7 @@ #define WM_PINTERP (MAX_OPCODE + - #define WM_CINTERP (MAX_OPCODE + 5) - #define WM_WPOSXY (MAX_OPCODE + 6) - #define WM_FB_WRITE (MAX_OPCODE + 7) -+#define MAX_WM_OPCODE (MAX_OPCODE + 8) - - #define PROGRAM_PAYLOAD (PROGRAM_FILE_MAX) - #define PAYLOAD_DEPTH (FRAG_ATTRIB_MAX) -diff --git a/src/mesa/drivers/dri/i965/brw_wm_fp.c b/src/mesa/drivers/dri/i965/brw_wm_fp.c -index 203eeea..8bf5579 100644 ---- a/src/mesa/drivers/dri/i965/brw_wm_fp.c -+++ b/src/mesa/drivers/dri/i965/brw_wm_fp.c -@@ -520,6 +520,35 @@ static void precalc_lit( struct brw_wm_c - static void precalc_tex( struct brw_wm_compile *c, - const struct prog_instruction *inst ) - { -+ struct prog_src_register coord; -+ struct prog_dst_register tmpcoord; -+ -+ if (inst->TexSrcTarget == TEXTURE_RECT_INDEX) { -+ struct prog_src_register scale = -+ search_or_add_param6( c, -+ STATE_INTERNAL, -+ STATE_TEXRECT_SCALE, -+ inst->TexSrcUnit, -+ 0,0,0 ); -+ -+ tmpcoord = get_temp(c); -+ -+ /* coord.xy = MUL inst->SrcReg[0], { 1/width, 1/height } -+ */ -+ emit_op(c, -+ OPCODE_MUL, -+ tmpcoord, -+ 0, 0, 0, -+ inst->SrcReg[0], -+ scale, -+ src_undef()); -+ -+ coord = src_reg_from_dst(tmpcoord); -+ } -+ else { -+ coord = inst->SrcReg[0]; -+ } -+ - /* Need to emit YUV texture conversions by hand. Probably need to - * do this here - the alternative is in brw_wm_emit.c, but the - * conversion requires allocating a temporary variable which we -@@ -532,7 +561,7 @@ static void precalc_tex( struct brw_wm_c - inst->SaturateMode, - inst->TexSrcUnit, - inst->TexSrcTarget, -- inst->SrcReg[0], -+ coord, - src_undef(), - src_undef()); - } -@@ -604,7 +633,12 @@ static void precalc_tex( struct brw_wm_c - src_swizzle1(tmpsrc, Z), - src_swizzle1(C1, W), - src_swizzle1(src_reg_from_dst(dst), Y)); -+ -+ release_temp(c, tmp); - } -+ -+ if (inst->TexSrcTarget == GL_TEXTURE_RECTANGLE_NV) -+ release_temp(c, tmpcoord); - } - - -@@ -769,6 +803,27 @@ static void validate_src_regs( struct br - - - -+static void print_insns( const struct prog_instruction *insn, -+ GLuint nr ) -+{ -+ GLuint i; -+ for (i = 0; i < nr; i++, insn++) { -+ _mesa_printf("%3d: ", i); -+ if (insn->Opcode < MAX_OPCODE) -+ _mesa_print_instruction(insn); -+ else if (insn->Opcode < MAX_WM_OPCODE) { -+ GLuint idx = insn->Opcode - MAX_OPCODE; -+ -+ _mesa_print_alu_instruction(insn, -+ wm_opcode_strings[idx], -+ 3); -+ } -+ else -+ _mesa_printf("UNKNOWN\n"); -+ -+ } -+} -+ - void brw_wm_pass_fp( struct brw_wm_compile *c ) - { - struct brw_fragment_program *fp = c->fp; -@@ -867,7 +922,7 @@ void brw_wm_pass_fp( struct brw_wm_compi - - if (INTEL_DEBUG & DEBUG_WM) { - _mesa_printf("\n\n\npass_fp:\n"); --/* _mesa_debug_fp_inst(c->nr_fp_insns, c->prog_instructions, wm_opcode_strings, wm_file_strings); */ -+ print_insns( c->prog_instructions, c->nr_fp_insns ); - _mesa_printf("\n"); - } - } -diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -index 6ccf56e..5c7dc50 100644 ---- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -@@ -85,7 +85,8 @@ static GLuint translate_tex_format( GLui - return BRW_SURFACEFORMAT_L8A8_UNORM; - - case MESA_FORMAT_RGB888: -- return BRW_SURFACEFORMAT_R8G8B8_UNORM; -+ assert(0); /* not supported for sampling */ -+ return BRW_SURFACEFORMAT_R8G8B8_UNORM; - - case MESA_FORMAT_ARGB8888: - return BRW_SURFACEFORMAT_B8G8R8A8_UNORM; -@@ -93,6 +94,15 @@ static GLuint translate_tex_format( GLui - case MESA_FORMAT_RGBA8888_REV: - return BRW_SURFACEFORMAT_R8G8B8A8_UNORM; - -+ case MESA_FORMAT_RGB565: -+ return BRW_SURFACEFORMAT_B5G6R5_UNORM; -+ -+ case MESA_FORMAT_ARGB1555: -+ return BRW_SURFACEFORMAT_B5G5R5A1_UNORM; -+ -+ case MESA_FORMAT_ARGB4444: -+ return BRW_SURFACEFORMAT_B4G4R4A4_UNORM; -+ - case MESA_FORMAT_YCBCR_REV: - return BRW_SURFACEFORMAT_YCRCB_NORMAL; - -diff --git a/src/mesa/drivers/dri/i965/bufmgr.h b/src/mesa/drivers/dri/i965/bufmgr.h -index 83a810c..6932522 100644 ---- a/src/mesa/drivers/dri/i965/bufmgr.h -+++ b/src/mesa/drivers/dri/i965/bufmgr.h -@@ -182,6 +182,8 @@ void bmUnmapBufferAUB( struct intel_cont - int bmValidateBuffers( struct intel_context * ); - void bmReleaseBuffers( struct intel_context * ); - -+GLuint bmCtxId( struct intel_context *intel ); -+ - - GLboolean bmError( struct intel_context * ); - void bmEvictAll( struct intel_context * ); -diff --git a/src/mesa/drivers/dri/i965/bufmgr_fake.c b/src/mesa/drivers/dri/i965/bufmgr_fake.c -index 8f182f3..30a235a 100644 ---- a/src/mesa/drivers/dri/i965/bufmgr_fake.c -+++ b/src/mesa/drivers/dri/i965/bufmgr_fake.c -@@ -117,6 +117,7 @@ struct bufmgr { - struct block fenced; /* after bmFenceBuffers (mi_flush, emit irq, write dword) */ - /* then to pool->lru or free() */ - -+ unsigned ctxId; - unsigned last_fence; - unsigned free_on_hardware; - -@@ -578,6 +579,12 @@ struct bufmgr *bm_fake_intel_Attach( str - make_empty_list(&bm.referenced); - make_empty_list(&bm.fenced); - make_empty_list(&bm.on_hardware); -+ -+ /* The context id of any of the share group. This won't be used -+ * in communication with the kernel, so it doesn't matter if -+ * this context is eventually deleted. -+ */ -+ bm.ctxId = intel->hHWContext; - } - - nr_attach++; -@@ -1242,7 +1249,6 @@ void bmReleaseBuffers( struct intel_cont - LOCK(bm); - { - struct block *block, *tmp; -- assert(intel->locked); - - foreach_s (block, tmp, &bm->referenced) { - -@@ -1432,3 +1438,9 @@ GLboolean bmError( struct intel_context - - return retval; - } -+ -+ -+GLuint bmCtxId( struct intel_context *intel ) -+{ -+ return intel->bm->ctxId; -+} -diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c -index 2191dd5..b09b0a9 100644 ---- a/src/mesa/drivers/dri/i965/intel_blit.c -+++ b/src/mesa/drivers/dri/i965/intel_blit.c -@@ -74,9 +74,6 @@ void intelCopyBuffer( const __DRIdrawabl - - if (!rect) - { -- /* This is a really crappy way to do wait-for-vblank. I guess -- * it sortof works in the single-application case. -- */ - UNLOCK_HARDWARE( intel ); - driWaitForVBlank( dPriv, &intel->vbl_seq, intel->vblank_flags, & missed_target ); - LOCK_HARDWARE( intel ); -@@ -291,8 +288,12 @@ void intelEmitCopyBlit( struct intel_con - - /* Initial y values don't seem to work with negative pitches. If - * we adjust the offsets manually (below), it seems to work fine. -+ * -+ * On the other hand, if we always adjust, the hardware doesn't -+ * know which blit directions to use, so overlapping copypixels get -+ * the wrong result. - */ -- if (0) { -+ if (dst_pitch > 0 && src_pitch > 0) { - BEGIN_BATCH(8, INTEL_BATCH_NO_CLIPRECTS); - OUT_BATCH( CMD ); - OUT_BATCH( dst_pitch | BR13 ); -diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c -index 59fc807..5f19137 100644 ---- a/src/mesa/drivers/dri/i965/intel_context.c -+++ b/src/mesa/drivers/dri/i965/intel_context.c -@@ -149,6 +149,10 @@ const struct dri_extension card_extensio - { "GL_ARB_texture_env_combine", NULL }, - { "GL_ARB_texture_env_dot3", NULL }, - { "GL_ARB_texture_mirrored_repeat", NULL }, -+ { "GL_ARB_texture_non_power_of_two", NULL }, -+ { "GL_ARB_texture_rectangle", NULL }, -+ { "GL_NV_texture_rectangle", NULL }, -+ { "GL_EXT_texture_rectangle", NULL }, - { "GL_ARB_texture_rectangle", NULL }, - { "GL_ARB_vertex_buffer_object", GL_ARB_vertex_buffer_object_functions }, - { "GL_ARB_vertex_program", GL_ARB_vertex_program_functions }, -@@ -255,10 +259,14 @@ void intelInitDriverFunctions( struct dd - */ - functions->Accum = _swrast_Accum; - functions->Bitmap = _swrast_Bitmap; -- functions->CopyPixels = _swrast_CopyPixels; - functions->ReadPixels = _swrast_ReadPixels; - functions->DrawPixels = _swrast_DrawPixels; - -+ /* CopyPixels can be accelerated even with the current memory -+ * manager: -+ */ -+ functions->CopyPixels = intelCopyPixels; -+ - intelInitTextureFuncs( functions ); - intelInitStateFuncs( functions ); - intelInitBufferFuncs( functions ); -@@ -370,8 +378,6 @@ GLboolean intelInitContext( struct intel - exit(1); - } - -- _math_matrix_ctr (&intel->ViewportMatrix); -- - driInitExtensions( ctx, card_extensions, - GL_TRUE ); - -@@ -446,8 +452,6 @@ GLboolean intelInitContext( struct intel - /* DRI_TEXMGR_DO_TEXTURE_RECT ); */ - - -- intel->prim.primitive = ~0; -- - if (getenv("INTEL_NO_RAST")) { - fprintf(stderr, "disabling 3D rasterization\n"); - intel->no_rast = 1; -@@ -537,18 +541,13 @@ GLboolean intelMakeCurrent(__DRIcontextP - } - - --static void lost_hardware( struct intel_context *intel ) --{ -- bm_fake_NotifyContendedLockTake( intel ); -- intel->vtbl.lost_hardware( intel ); --} -- - static void intelContendedLock( struct intel_context *intel, GLuint flags ) - { - __DRIdrawablePrivate *dPriv = intel->driDrawable; - __DRIscreenPrivate *sPriv = intel->driScreen; - volatile drmI830Sarea * sarea = intel->sarea; - int me = intel->hHWContext; -+ int my_bufmgr = bmCtxId(intel); - - drmGetLock(intel->driFd, intel->hHWContext, flags); - -@@ -562,12 +561,23 @@ static void intelContendedLock( struct i - - - intel->locked = 1; -+ intel->need_flush = 1; - - /* Lost context? - */ - if (sarea->ctxOwner != me) { -+ DBG("Lost Context: sarea->ctxOwner %x me %x\n", sarea->ctxOwner, me); - sarea->ctxOwner = me; -- lost_hardware(intel); -+ intel->vtbl.lost_hardware( intel ); -+ } -+ -+ /* As above, but don't evict the texture data on transitions -+ * between contexts which all share a local buffer manager. -+ */ -+ if (sarea->texAge != my_bufmgr) { -+ DBG("Lost Textures: sarea->texAge %x my_bufmgr %x\n", sarea->ctxOwner, my_bufmgr); -+ sarea->texAge = my_bufmgr; -+ bm_fake_NotifyContendedLockTake( intel ); - } - - /* Drawable changed? -diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h -index 0328cb9..d0354cf 100644 ---- a/src/mesa/drivers/dri/i965/intel_context.h -+++ b/src/mesa/drivers/dri/i965/intel_context.h -@@ -176,16 +176,6 @@ struct intel_context - - struct intel_batchbuffer *batch; - -- struct { -- GLuint id; -- GLuint primitive; -- GLubyte *start_ptr; -- void (*flush)( struct intel_context * ); -- } prim; -- -- GLboolean locked; -- GLboolean strict_conformance; -- - GLubyte clear_chan[4]; - GLuint ClearColor; - GLuint ClearDepth; -@@ -201,6 +191,10 @@ struct intel_context - GLboolean no_hw; - GLboolean no_rast; - GLboolean thrashing; -+ GLboolean locked; -+ GLboolean strict_conformance; -+ GLboolean need_flush; -+ - - - /* AGP memory buffer manager: -@@ -210,26 +204,14 @@ struct intel_context - - /* State for intelvb.c and inteltris.c. - */ -- GLuint RenderIndex; -- GLmatrix ViewportMatrix; - GLenum render_primitive; - GLenum reduced_primitive; -- GLuint vertex_size; -- GLubyte *verts; /* points to tnl->clipspace.vertex_buf */ -- - - struct intel_region *front_region; - struct intel_region *back_region; - struct intel_region *draw_region; - struct intel_region *depth_region; - -- -- /* Fallback rasterization functions -- */ -- intel_point_func draw_point; -- intel_line_func draw_line; -- intel_tri_func draw_tri; -- - /* These refer to the current draw (front vs. back) buffer: - */ - int drawX; /* origin of drawable in draw buffer */ -@@ -496,6 +478,13 @@ extern GLboolean intel_intersect_cliprec - const drm_clip_rect_t *b ); - - -+/* ================================================================ -+ * intel_pixel_copy.c: -+ */ -+void intelCopyPixels(GLcontext * ctx, -+ GLint srcx, GLint srcy, -+ GLsizei width, GLsizei height, -+ GLint destx, GLint desty, GLenum type); - - #define _NEW_WINDOW_POS 0x40000000 - -diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c -new file mode 100644 -index 0000000..ad27867 ---- /dev/null -+++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c -@@ -0,0 +1,239 @@ -+/************************************************************************** -+ * -+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. -+ * All Rights Reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sub license, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial portions -+ * of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR -+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ **************************************************************************/ -+ -+#include "glheader.h" -+#include "enums.h" -+#include "image.h" -+#include "mtypes.h" -+#include "macros.h" -+#include "state.h" -+#include "swrast/swrast.h" -+ -+#include "intel_screen.h" -+#include "intel_context.h" -+#include "intel_ioctl.h" -+#include "intel_batchbuffer.h" -+#include "intel_blit.h" -+#include "intel_regions.h" -+ -+ -+static struct intel_region * -+copypix_src_region(struct intel_context *intel, GLenum type) -+{ -+ switch (type) { -+ case GL_COLOR: -+ return intel_readbuf_region(intel); -+ case GL_DEPTH: -+ /* Don't think this is really possible execpt at 16bpp, when we have no stencil. -+ */ -+ if (intel->depth_region && intel->depth_region->cpp == 2) -+ return intel->depth_region; -+ case GL_STENCIL: -+ /* Don't think this is really possible. -+ */ -+ break; -+ case GL_DEPTH_STENCIL_EXT: -+ /* Does it matter whether it is stencil/depth or depth/stencil? -+ */ -+ return intel->depth_region; -+ default: -+ break; -+ } -+ -+ return NULL; -+} -+ -+ -+ -+ -+/** -+ * Check if any fragment operations are in effect which might effect -+ * glDraw/CopyPixels. -+ */ -+static GLboolean -+intel_check_blit_fragment_ops(GLcontext * ctx) -+{ -+ if (ctx->NewState) -+ _mesa_update_state(ctx); -+ -+ /* Could do logicop with the blitter: -+ */ -+ return !(ctx->_ImageTransferState || -+ ctx->Color.AlphaEnabled || -+ ctx->Depth.Test || -+ ctx->Fog.Enabled || -+ ctx->Stencil.Enabled || -+ !ctx->Color.ColorMask[0] || -+ !ctx->Color.ColorMask[1] || -+ !ctx->Color.ColorMask[2] || -+ !ctx->Color.ColorMask[3] || -+ ctx->Color.ColorLogicOpEnabled || -+ ctx->Texture._EnabledUnits || -+ ctx->FragmentProgram._Enabled); -+} -+ -+ -+ -+/** -+ * CopyPixels with the blitter. Don't support zooming, pixel transfer, etc. -+ */ -+static GLboolean -+do_blit_copypixels(GLcontext * ctx, -+ GLint srcx, GLint srcy, -+ GLsizei width, GLsizei height, -+ GLint dstx, GLint dsty, GLenum type) -+{ -+ struct intel_context *intel = intel_context(ctx); -+ struct intel_region *dst = intel_drawbuf_region(intel); -+ struct intel_region *src = copypix_src_region(intel, type); -+ -+ /* Copypixels can be more than a straight copy. Ensure all the -+ * extra operations are disabled: -+ */ -+ if (!intel_check_blit_fragment_ops(ctx) || -+ ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F) -+ return GL_FALSE; -+ -+ if (!src || !dst) -+ return GL_FALSE; -+ -+ -+ -+ intelFlush(&intel->ctx); -+ -+/* intel->vtbl.render_start(intel); */ -+/* intel->vtbl.emit_state(intel); */ -+ -+ LOCK_HARDWARE(intel); -+ -+ if (intel->driDrawable->numClipRects) { -+ __DRIdrawablePrivate *dPriv = intel->driDrawable; -+ drm_clip_rect_t *box = dPriv->pClipRects; -+ drm_clip_rect_t dest_rect; -+ GLint nbox = dPriv->numClipRects; -+ GLint delta_x = 0; -+ GLint delta_y = 0; -+ GLuint i; -+ -+ /* Do scissoring in GL coordinates: -+ */ -+ if (ctx->Scissor.Enabled) -+ { -+ GLint x = ctx->Scissor.X; -+ GLint y = ctx->Scissor.Y; -+ GLuint w = ctx->Scissor.Width; -+ GLuint h = ctx->Scissor.Height; -+ GLint dx = dstx - srcx; -+ GLint dy = dsty - srcy; -+ -+ if (!_mesa_clip_to_region(x, y, x+w, y+h, &dstx, &dsty, &width, &height)) -+ goto out; -+ -+ srcx = dstx - dx; -+ srcy = dsty - dy; -+ } -+ -+ /* Convert from GL to hardware coordinates: -+ */ -+ dsty = dPriv->h - dsty - height; -+ srcy = dPriv->h - srcy - height; -+ dstx += dPriv->x; -+ dsty += dPriv->y; -+ srcx += dPriv->x; -+ srcy += dPriv->y; -+ -+ /* Clip against the source region. This is the only source -+ * clipping we do. Dst is clipped with cliprects below. -+ */ -+ { -+ delta_x = srcx - dstx; -+ delta_y = srcy - dsty; -+ -+ if (!_mesa_clip_to_region(0, 0, src->pitch, src->height, -+ &srcx, &srcy, &width, &height)) -+ goto out; -+ -+ dstx = srcx - delta_x; -+ dsty = srcy - delta_y; -+ } -+ -+ dest_rect.x1 = dstx; -+ dest_rect.y1 = dsty; -+ dest_rect.x2 = dstx + width; -+ dest_rect.y2 = dsty + height; -+ -+/* intel->vtbl.emit_flush(intel, 0); */ -+ -+ /* Could do slightly more clipping: Eg, take the intersection of -+ * the existing set of cliprects and those cliprects translated -+ * by delta_x, delta_y: -+ * -+ * This code will not overwrite other windows, but will -+ * introduce garbage when copying from obscured window regions. -+ */ -+ for (i = 0; i < nbox; i++) { -+ drm_clip_rect_t rect; -+ -+ if (!intel_intersect_cliprects(&rect, &dest_rect, &box[i])) -+ continue; -+ -+ -+ intelEmitCopyBlit(intel, -+ dst->cpp, -+ src->pitch, src->buffer, 0, src->tiled, -+ dst->pitch, dst->buffer, 0, dst->tiled, -+ rect.x1 + delta_x, -+ rect.y1 + delta_y, /* srcx, srcy */ -+ rect.x1, rect.y1, /* dstx, dsty */ -+ rect.x2 - rect.x1, rect.y2 - rect.y1); -+ } -+ -+ intel->need_flush = GL_TRUE; -+ out: -+ intel_batchbuffer_flush(intel->batch); -+ } -+ UNLOCK_HARDWARE(intel); -+ return GL_TRUE; -+} -+ -+void -+intelCopyPixels(GLcontext * ctx, -+ GLint srcx, GLint srcy, -+ GLsizei width, GLsizei height, -+ GLint destx, GLint desty, GLenum type) -+{ -+ if (INTEL_DEBUG & DEBUG_PIXEL) -+ fprintf(stderr, "%s\n", __FUNCTION__); -+ -+ if (do_blit_copypixels(ctx, srcx, srcy, width, height, destx, desty, type)) -+ return; -+ -+ if (INTEL_DEBUG & DEBUG_PIXEL) -+ _mesa_printf("fallback to _swrast_CopyPixels\n"); -+ -+ _swrast_CopyPixels(ctx, srcx, srcy, width, height, destx, desty, type); -+} -diff --git a/src/mesa/drivers/dri/i965/intel_span.c b/src/mesa/drivers/dri/i965/intel_span.c -index c68def5..60fbecc 100644 ---- a/src/mesa/drivers/dri/i965/intel_span.c -+++ b/src/mesa/drivers/dri/i965/intel_span.c -@@ -35,6 +35,7 @@ #include "intel_regions.h" - #include "intel_span.h" - #include "intel_ioctl.h" - #include "intel_tex.h" -+#include "intel_batchbuffer.h" - #include "swrast/swrast.h" - - #undef DBG -@@ -207,6 +208,16 @@ void intelSpanRenderStart( GLcontext *ct - { - struct intel_context *intel = intel_context(ctx); - -+ if (intel->need_flush) { -+ LOCK_HARDWARE(intel); -+ intel->vtbl.emit_flush(intel, 0); -+ intel_batchbuffer_flush(intel->batch); -+ intel->need_flush = 0; -+ UNLOCK_HARDWARE(intel); -+ intelFinish(&intel->ctx); -+ } -+ -+ - LOCK_HARDWARE(intel); - - /* Just map the framebuffer and all textures. Bufmgr code will -diff --git a/src/mesa/drivers/dri/i965/intel_state.c b/src/mesa/drivers/dri/i965/intel_state.c -index a471f67..ec6e046 100644 ---- a/src/mesa/drivers/dri/i965/intel_state.c -+++ b/src/mesa/drivers/dri/i965/intel_state.c -@@ -182,39 +182,6 @@ static void intelClearColor(GLcontext *c - } - - --static void intelCalcViewport( GLcontext *ctx ) --{ -- struct intel_context *intel = intel_context(ctx); -- const GLfloat *v = ctx->Viewport._WindowMap.m; -- GLfloat *m = intel->ViewportMatrix.m; -- GLint h = 0; -- -- if (intel->driDrawable) -- h = intel->driDrawable->h + SUBPIXEL_Y; -- -- /* See also intel_translate_vertex. SUBPIXEL adjustments can be done -- * via state vars, too. -- */ -- m[MAT_SX] = v[MAT_SX]; -- m[MAT_TX] = v[MAT_TX] + SUBPIXEL_X; -- m[MAT_SY] = - v[MAT_SY]; -- m[MAT_TY] = - v[MAT_TY] + h; -- m[MAT_SZ] = v[MAT_SZ] * intel->depth_scale; -- m[MAT_TZ] = v[MAT_TZ] * intel->depth_scale; --} -- --static void intelViewport( GLcontext *ctx, -- GLint x, GLint y, -- GLsizei width, GLsizei height ) --{ -- intelCalcViewport( ctx ); --} -- --static void intelDepthRange( GLcontext *ctx, -- GLclampd nearval, GLclampd farval ) --{ -- intelCalcViewport( ctx ); --} - - /* Fallback to swrast for select and feedback. - */ -@@ -228,8 +195,6 @@ static void intelRenderMode( GLcontext * - void intelInitStateFuncs( struct dd_function_table *functions ) - { - functions->RenderMode = intelRenderMode; -- functions->Viewport = intelViewport; -- functions->DepthRange = intelDepthRange; - functions->ClearColor = intelClearColor; - } - -diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c -index 5f65242..91ae097 100644 ---- a/src/mesa/drivers/dri/i965/intel_tex_validate.c -+++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c -@@ -166,12 +166,15 @@ GLuint intel_finalize_mipmap_tree( struc - * target, imageFormat, etc. - */ - if (intelObj->mt && -- (intelObj->mt->first_level != intelObj->firstLevel || -- intelObj->mt->last_level != intelObj->lastLevel || -+ (intelObj->mt->target != intelObj->base.Target || - intelObj->mt->internal_format != firstImage->InternalFormat || -+ intelObj->mt->first_level != intelObj->firstLevel || -+ intelObj->mt->last_level != intelObj->lastLevel || - intelObj->mt->width0 != firstImage->Width || - intelObj->mt->height0 != firstImage->Height || -- intelObj->mt->depth0 != firstImage->Depth)) -+ intelObj->mt->depth0 != firstImage->Depth || -+ intelObj->mt->cpp != firstImage->TexFormat->TexelBytes || -+ intelObj->mt->compressed != firstImage->IsCompressed)) - { - intel_miptree_destroy(intel, intelObj->mt); - intelObj->mt = NULL; -diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c -index 590f357..f999e06 100644 ---- a/src/mesa/shader/program.c -+++ b/src/mesa/shader/program.c -@@ -917,6 +917,15 @@ _mesa_fetch_state(GLcontext *ctx, const - case STATE_NORMAL_SCALE: - ASSIGN_4V(value, ctx->_ModelViewInvScale, 0, 0, 1); - break; -+ case STATE_TEXRECT_SCALE: { -+ const int unit = (int) state[2]; -+ const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current; -+ if (texObj) { -+ struct gl_texture_image *texImage = texObj->Image[0][0]; -+ ASSIGN_4V(value, 1.0 / texImage->Width, 1.0 / texImage->Height, 0, 1); -+ } -+ break; -+ } - default: - _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()"); - return; -@@ -988,6 +997,8 @@ static GLuint make_state_flags(const GLi - switch (state[1]) { - case STATE_NORMAL_SCALE: - return _NEW_MODELVIEW; -+ case STATE_TEXRECT_SCALE: -+ return _NEW_TEXTURE; - default: - _mesa_problem(NULL, "unexpected int. state in make_state_flags()"); - return 0; -@@ -1450,19 +1461,8 @@ static const struct instruction_info Ins - GLuint - _mesa_num_inst_src_regs(enum prog_opcode opcode) - { -- GLuint i; --#ifdef DEBUG -- for (i = 0; i < MAX_OPCODE; i++) { -- ASSERT(i == InstInfo[i].Opcode); -- } --#endif -- for (i = 0; i < MAX_OPCODE; i++) { -- if (InstInfo[i].Opcode == opcode) { -- return InstInfo[i].NumSrcRegs; -- } -- } -- _mesa_problem(NULL, "invalid opcode in _mesa_num_inst_src_regs"); -- return 0; -+ ASSERT(opcode == InstInfo[opcode].Opcode); -+ return InstInfo[opcode].NumSrcRegs; - } - - -@@ -1601,6 +1601,38 @@ print_src_reg(const struct prog_src_regi - srcReg->NegateBase, GL_FALSE)); - } - -+void -+_mesa_print_alu_instruction(const struct prog_instruction *inst, -+ const char *opcode_string, -+ GLuint numRegs) -+{ -+ GLuint j; -+ -+ _mesa_printf("%s", opcode_string); -+ -+ /* frag prog only */ -+ if (inst->SaturateMode == SATURATE_ZERO_ONE) -+ _mesa_printf("_SAT"); -+ -+ if (inst->DstReg.File != PROGRAM_UNDEFINED) { -+ _mesa_printf(" %s[%d]%s", -+ program_file_string((enum register_file) inst->DstReg.File), -+ inst->DstReg.Index, -+ writemask_string(inst->DstReg.WriteMask)); -+ } -+ -+ if (numRegs > 0) -+ _mesa_printf(", "); -+ -+ for (j = 0; j < numRegs; j++) { -+ print_src_reg(inst->SrcReg + j); -+ if (j + 1 < numRegs) -+ _mesa_printf(", "); -+ } -+ -+ _mesa_printf(";\n"); -+} -+ - - /** - * Print a single vertex/fragment program instruction. -@@ -1662,34 +1694,10 @@ _mesa_print_instruction(const struct pro - /* XXX may need for other special-case instructions */ - default: - /* typical alu instruction */ -- { -- const GLuint numRegs = _mesa_num_inst_src_regs(inst->Opcode); -- GLuint j; -- -- _mesa_printf("%s", _mesa_opcode_string(inst->Opcode)); -- -- /* frag prog only */ -- if (inst->SaturateMode == SATURATE_ZERO_ONE) -- _mesa_printf("_SAT"); -- -- if (inst->DstReg.File != PROGRAM_UNDEFINED) { -- _mesa_printf(" %s[%d]%s", -- program_file_string((enum register_file) inst->DstReg.File), -- inst->DstReg.Index, -- writemask_string(inst->DstReg.WriteMask)); -- } -- -- if (numRegs > 0) -- _mesa_printf(", "); -- -- for (j = 0; j < numRegs; j++) { -- print_src_reg(inst->SrcReg + j); -- if (j + 1 < numRegs) -- _mesa_printf(", "); -- } -- -- _mesa_printf(";\n"); -- } -+ _mesa_print_alu_instruction(inst, -+ _mesa_opcode_string(inst->Opcode), -+ _mesa_num_inst_src_regs(inst->Opcode)); -+ break; - } - } - -diff --git a/src/mesa/shader/program.h b/src/mesa/shader/program.h -index 6a34533..cf3b1cc 100644 ---- a/src/mesa/shader/program.h -+++ b/src/mesa/shader/program.h -@@ -188,6 +188,7 @@ enum state_index { - - STATE_INTERNAL, /* Mesa additions */ - STATE_NORMAL_SCALE, -+ STATE_TEXRECT_SCALE, - STATE_POSITION_NORMALIZED /* normalized light position */ - }; - -@@ -264,6 +265,11 @@ _mesa_load_state_parameters(GLcontext *c - extern void - _mesa_print_instruction(const struct prog_instruction *inst); - -+void -+_mesa_print_alu_instruction(const struct prog_instruction *inst, -+ const char *opcode_string, -+ GLuint numRegs); -+ - extern void - _mesa_print_program(const struct gl_program *prog); - rmfile ./source/x11/mesa/post-6.5.1-i965-fixes.patch } From krics at linuxforum.hu Tue Dec 5 22:38:27 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 22:38:35 2006 Subject: [Frugalware-darcs] frugalware-current: mesademos-6.5.2-1-x86_64 Message-ID: <20061205213827.65E08FA4709@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205213756-d209c-fce8beddda10f162f778537371ebfd8336957a91.gz; [mesademos-6.5.2-1-x86_64 Christian Hamar alias krix **20061205213756 * Version bump ] { hunk ./source/x11/mesademos/FrugalBuild 6 -pkgver=6.5.1 +pkgver=6.5.2 hunk ./source/x11/mesademos/FrugalBuild 9 -_F_sourceforge_dirname="mesa3d" -_F_sourceforge_name="MesaDemos" -_F_sourceforge_ext=".tar.bz2" -Finclude sourceforge hunk ./source/x11/mesademos/FrugalBuild 10 -depends=('mesa>=6.5.1' 'libstdc++' 'freeglut' 'libx11' 'libxmu' 'libxi' 'libdrm' 'libxvmc' 'libxxf86vm') +depends=('mesa>=6.5.2-1' 'libstdc++' 'freeglut' 'libx11>=1.1.1' 'libxmu' 'libxi' 'libdrm>=2.3.0' 'libxvmc' 'libxxf86vm') hunk ./source/x11/mesademos/FrugalBuild 14 -source=($source $pkgname-6.5.1-makefile.patch) -sha1sums=('6576410f51ff2c2bf68cec1dcb188ea26307bf56' \ +source=(http://heanet.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-$pkgver.tar.bz2 \ + $pkgname-6.5.1-makefile.patch) +sha1sums=('beac8b2fa9c6e25efd44b911d2d7952b2f87534c' \ } From krics at linuxforum.hu Tue Dec 5 22:51:56 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 22:52:02 2006 Subject: [Frugalware-darcs] frugalware-current: libxi-1.0.2-1-x86_64 Message-ID: <20061205215156.EB2A3FA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205215139-d209c-64f67838d28c3960372e351f88b6d9504e86a083.gz; [libxi-1.0.2-1-x86_64 Christian Hamar alias krix **20061205215139 * Version bump ] { hunk ./source/x11/libxi/FrugalBuild 6 -pkgver=1.1.0 +pkgver=1.0.2 hunk ./source/x11/libxi/FrugalBuild 12 -depends=('libx11' 'libxext' 'inputproto>=1.4') +depends=('libx11>=1.1.0' 'libxext' 'inputproto') hunk ./source/x11/libxi/FrugalBuild 16 -sha1sums=('8dc380408dfea6357ea68ee375d0c5368d56066f') +sha1sums=('bd830185ffa45017333d0856053ca8ec37d47bae') +force="y" } From krics at linuxforum.hu Tue Dec 5 23:26:10 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 23:26:26 2006 Subject: [Frugalware-darcs] frugalware-current: xorg-server-1.1.99.903-1-x86_64 Message-ID: <20061205222610.3F8E2FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205222351-d209c-c44941760d0251439600d614125c32e3005b9c7a.gz; [xorg-server-1.1.99.903-1-x86_64 Christian Hamar alias krix **20061205222351 * Version bump * \o/ Enabled AIGLX back :P * Depends on latest stuffs :P * This is Xorg 7.2 RC3 ] { hunk ./source/x11/xorg-server/FrugalBuild 5 -pkgver=1.1.99.901 +pkgver=1.1.99.903 hunk ./source/x11/xorg-server/FrugalBuild 7 -mesaver=6.5.1 +mesaver=6.5.2 hunk ./source/x11/xorg-server/FrugalBuild 12 -depends=('libxfont>=1.2.3' 'libx11>=1.0.99.1' 'xtrans>=1.0.2' 'libxau' \ +depends=('libxfont>=1.2.5' 'libx11>=1.1.1' 'xtrans>=1.0.2' 'libxau' \ hunk ./source/x11/xorg-server/FrugalBuild 14 - 'libxi' 'freetype2' 'mesa>=6.5.1-3' 'font-cursor-misc' 'font-misc-misc' \ - 'xbitmaps' 'xkbdata' 'iceauth' 'rgb' 'xauth' 'xinit>=1.0.3' 'libxaw' \ + 'libxi=1.0.2' 'freetype2' 'mesa>=6.5.2-1' 'font-cursor-misc' 'font-misc-misc' \ + 'xbitmaps' 'xkeyboard-config' 'iceauth' 'rgb' 'xauth' 'xinit>=1.0.3' 'libxaw' \ hunk ./source/x11/xorg-server/FrugalBuild 17 - 'xorg-cf-files' 'libxtst' 'font-alias') + 'xorg-cf-files' 'libxtst' 'font-alias' 'libxcb>=1.0') hunk ./source/x11/xorg-server/FrugalBuild 22 - 'glproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir' 'mkfontscale>=1.0.2' 'fontcacheproto' 'xorg-sgml-doctools') + 'glproto' 'xf86driproto' 'libdrm>=2.3.0' 'printproto' 'mkfontdir' 'mkfontscale>=1.0.3' 'fontcacheproto' 'xorg-sgml-doctools' 'util-macros') hunk ./source/x11/xorg-server/FrugalBuild 28 -source=(${source[@]} http://heanet.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesaver.tar.bz2 \ +source=(${source[@]} http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesaver.tar.bz2 \ hunk ./source/x11/xorg-server/FrugalBuild 36 - post-6.5.1-i965-fixes.patch \ hunk ./source/x11/xorg-server/FrugalBuild 38 - xprint-rc-files-fix.patch) -sha1sums=('9201f9ec7250eb76dabbc2beb50158aa37ff9b9e' \ - 'cd3b314808534b0306c7f89e9a72c9c23dbff239' \ + xprint-rc-files-fix.patch \ + bug-8991-fix.patch \ + xorg-mesa.patch) +sha1sums=('e63ebbd368ca0f962de2f1e6a7720473e12f2d9b' \ + 'ba860bb6ee57c02202342dfd5927464a068ea18f' \ hunk ./source/x11/xorg-server/FrugalBuild 49 - 'aa4926e039e394bd784fa92ecb86f58344a49110' \ - '9141ecfa0f9dd8290b6fce840920af181c3deb87' \ + 'b49bb4f22426fd0dab7551ef8907276214c9a3fa' \ hunk ./source/x11/xorg-server/FrugalBuild 52 - '0eb64d46172b6f2f4462c02dad7964c6d7656076') + '0eb64d46172b6f2f4462c02dad7964c6d7656076' \ + '60ccfea12bddf6cf0a7f56000472781442b10701' \ + '43addaea42f9308193770c12371960db24ab7db6') hunk ./source/x11/xorg-server/FrugalBuild 67 - Fpatch post-6.5.1-i965-fixes.patch + Fpatch mesa-debug-glapi-fixes.patch hunk ./source/x11/xorg-server/FrugalBuild 80 + # https://bugs.freedesktop.org/show_bug.cgi?id=8991 + Fpatch bug-8991-fix.patch + + Fpatch xorg-mesa.patch + + Fautoreconf + hunk ./source/x11/xorg-server/FrugalBuild 91 - --enable-xprint \ + --disable-xprint \ hunk ./source/x11/xorg-server/FrugalBuild 94 + --disable-dbus \ hunk ./source/x11/xorg-server/FrugalBuild 108 - --disable-aiglx --without-aiglx --enable-aiglx=no + --enable-aiglx=yes +# --disable-aiglx --without-aiglx --enable-aiglx=no hunk ./source/x11/xorg-server/FrugalBuild 113 - Frcd xprint +# Disabled for reasons :P +# Frcd xprint hunk ./source/x11/xorg-server/FrugalBuild 117 - Fmkdir /etc/X11/Xsession.d.xprint - Fmv /etc/X11/Xsession.d/92* /etc/X11/Xsession.d.xprint/ +# Fmkdir /etc/X11/Xsession.d.xprint +# Fmv /etc/X11/Xsession.d/92* /etc/X11/Xsession.d.xprint/ addfile ./source/x11/xorg-server/bug-8991-fix.patch hunk ./source/x11/xorg-server/bug-8991-fix.patch 1 +--- xorg-server-9999/GL/glx/indirect_table.c.orig 2006-10-12 16:02:06.000000000 +0800 ++++ xorg-server-9999/GL/glx/indirect_table.c 2006-10-12 16:15:35.000000000 +0800 +@@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di + + /*****************************************************************/ + /* tree depth = 13 */ +-static const int_fast16_t VendorPriv_dispatch_tree[155] = { ++static const int_fast16_t VendorPriv_dispatch_tree[159] = { + /* [0] -> opcode range [0, 131072], node depth 1 */ + 2, + 5, +@@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis + /* [152] -> opcode range [65536, 65552], node depth 13 */ + 1, + LEAF(88), ++ 156, + EMPTY_LEAF, + ++ /* [156] -> opcode range [65544, 65552], node depth 13 */ ++ 1, ++ LEAF(96), ++ EMPTY_LEAF, + }; + +-static const void *VendorPriv_function_table[96][2] = { ++static const void *VendorPriv_function_table[99][2] = { + /* [ 0] = 0 */ {NULL, NULL}, + /* [ 1] = 1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT}, + /* [ 2] = 2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT}, +@@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t + /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX}, + /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX}, + /* [ 95] = 65543 */ {NULL, NULL}, ++ /* [ 96] = 65544 */ {NULL, NULL}, ++ /* [ 97] = 65545 */ {NULL, NULL}, ++ /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX}, + }; + + const struct __glXDispatchInfo VendorPriv_dispatch_info = { hunk ./source/x11/xorg-server/mesa-build-config.patch 61 --DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300 -+DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 +-DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 ++DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300 hunk ./source/x11/xorg-server/post-6.5.1-i965-fixes.patch 1 -diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile -index e4fb451..dfa9318 100644 ---- a/src/mesa/drivers/dri/i965/Makefile -+++ b/src/mesa/drivers/dri/i965/Makefile -@@ -16,6 +16,7 @@ DRIVER_SOURCES = \ - intel_regions.c \ - intel_screen.c \ - intel_span.c \ -+ intel_pixel_copy.c \ - intel_state.c \ - intel_tex.c \ - intel_tex_validate.c \ -diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c -index f12fb4c..e476b18 100644 ---- a/src/mesa/drivers/dri/i965/brw_draw.c -+++ b/src/mesa/drivers/dri/i965/brw_draw.c -@@ -328,6 +328,7 @@ static GLboolean brw_try_draw_prims( GLc - brw_emit_prim(brw, &prim[i]); - } - -+ intel->need_flush = GL_TRUE; - retval = GL_TRUE; - } - -@@ -400,7 +401,7 @@ GLboolean brw_draw_prims( GLcontext *ctx - retval = brw_try_draw_prims(ctx, arrays, prim, nr_prims, ib, min_index, max_index, flags); - } - -- if (intel->aub_file) { -+ if (intel->aub_file && (INTEL_DEBUG & DEBUG_SYNC)) { - intelFinish( &intel->ctx ); - intel->aub_wrap = 1; - } -diff --git a/src/mesa/drivers/dri/i965/brw_exec_api.c b/src/mesa/drivers/dri/i965/brw_exec_api.c -index ca012db..470fa6f 100644 ---- a/src/mesa/drivers/dri/i965/brw_exec_api.c -+++ b/src/mesa/drivers/dri/i965/brw_exec_api.c -@@ -394,7 +394,7 @@ static void GLAPIENTRY brw_exec_EvalCoor - - for (i = 0 ; i <= BRW_ATTRIB_INDEX ; i++) { - if (exec->eval.map1[i].map) -- if (exec->vtx.attrsz[i] != exec->eval.map1[i].sz) -+ if (exec->vtx.active_sz[i] != exec->eval.map1[i].sz) - brw_exec_fixup_vertex( ctx, i, exec->eval.map1[i].sz ); - } - } -diff --git a/src/mesa/drivers/dri/i965/brw_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c -index d70b2ea..8332d86 100644 ---- a/src/mesa/drivers/dri/i965/brw_tex.c -+++ b/src/mesa/drivers/dri/i965/brw_tex.c -@@ -49,34 +49,57 @@ #include "brw_defines.h" - - static const struct gl_texture_format * - brwChooseTextureFormat( GLcontext *ctx, GLint internalFormat, -- GLenum format, GLenum type ) -+ GLenum srcFormat, GLenum srcType ) - { - switch ( internalFormat ) { - case 4: - case GL_RGBA: - case GL_COMPRESSED_RGBA: -+ if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_SHORT_4_4_4_4_REV) -+ return &_mesa_texformat_argb4444; -+ else if (srcFormat == GL_BGRA && srcType == GL_UNSIGNED_SHORT_1_5_5_5_REV) -+ return &_mesa_texformat_argb1555; -+ else if ((srcFormat == GL_RGBA && srcType == GL_UNSIGNED_INT_8_8_8_8_REV) || -+ (srcFormat == GL_RGBA && srcType == GL_UNSIGNED_BYTE) || -+ (srcFormat == GL_ABGR_EXT && srcType == GL_UNSIGNED_INT_8_8_8_8)) -+ return &_mesa_texformat_rgba8888_rev; -+ else -+ return &_mesa_texformat_argb8888; -+ - case GL_RGBA8: - case GL_RGB10_A2: - case GL_RGBA12: - case GL_RGBA16: -- case GL_RGBA4: -- case GL_RGBA2: -- case GL_RGB5_A1: - return &_mesa_texformat_argb8888; --/* return &_mesa_texformat_rgba8888_rev; */ - -- case 3: -- case GL_RGB: -- case GL_COMPRESSED_RGB: - case GL_RGB8: - case GL_RGB10: - case GL_RGB12: - case GL_RGB16: -+ /* Broadwater doesn't support RGB888 textures, so these must be -+ * stored as ARGB. -+ */ -+ return &_mesa_texformat_argb8888; -+ -+ case 3: -+ case GL_COMPRESSED_RGB: -+ case GL_RGB: -+ if (srcFormat == GL_RGB && -+ srcType == GL_UNSIGNED_SHORT_5_6_5) -+ return &_mesa_texformat_rgb565; -+ else -+ return &_mesa_texformat_argb8888; -+ -+ - case GL_RGB5: -- case GL_RGB4: -+ case GL_RGB5_A1: -+ return &_mesa_texformat_argb1555; -+ - case GL_R3_G3_B2: --/* return &_mesa_texformat_rgb888; */ -- return &_mesa_texformat_argb8888; -+ case GL_RGBA2: -+ case GL_RGBA4: -+ case GL_RGB4: -+ return &_mesa_texformat_argb4444; - - case GL_ALPHA: - case GL_ALPHA4: -@@ -115,8 +138,8 @@ brwChooseTextureFormat( GLcontext *ctx, - return &_mesa_texformat_i8; - - case GL_YCBCR_MESA: -- if (type == GL_UNSIGNED_SHORT_8_8_MESA || -- type == GL_UNSIGNED_BYTE) -+ if (srcType == GL_UNSIGNED_SHORT_8_8_MESA || -+ srcType == GL_UNSIGNED_BYTE) - return &_mesa_texformat_ycbcr; - else - return &_mesa_texformat_ycbcr_rev; -diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c -index f8aa068..1353325 100644 ---- a/src/mesa/drivers/dri/i965/brw_tex_layout.c -+++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c -@@ -138,13 +138,16 @@ GLboolean brw_miptree_layout( struct int - - /* Layout_below: step right after second mipmap. - */ -- if (level == mt->first_level + 1) -+ if (level == mt->first_level + 1) { - x += mt->pitch / 2; -+ x = (x + 3) & ~ 3; -+ } - else { - y += img_height; -+ y += align_h - 1; -+ y &= ~(align_h - 1); - } - -- - width = minify(width); - height = minify(height); - } -diff --git a/src/mesa/drivers/dri/i965/brw_util.c b/src/mesa/drivers/dri/i965/brw_util.c -index 5957b71..9d12c26 100644 ---- a/src/mesa/drivers/dri/i965/brw_util.c -+++ b/src/mesa/drivers/dri/i965/brw_util.c -@@ -98,6 +98,8 @@ static GLuint brw_parameter_state_flags( - switch (state[1]) { - case STATE_NORMAL_SCALE: - return _NEW_MODELVIEW; -+ case STATE_TEXRECT_SCALE: -+ return _NEW_TEXTURE; - default: - assert(0); - return 0; -diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h -index 74c3bbe..ec6ad61 100644 ---- a/src/mesa/drivers/dri/i965/brw_wm.h -+++ b/src/mesa/drivers/dri/i965/brw_wm.h -@@ -167,6 +167,7 @@ #define WM_PINTERP (MAX_OPCODE + - #define WM_CINTERP (MAX_OPCODE + 5) - #define WM_WPOSXY (MAX_OPCODE + 6) - #define WM_FB_WRITE (MAX_OPCODE + 7) -+#define MAX_WM_OPCODE (MAX_OPCODE + 8) - - #define PROGRAM_PAYLOAD (PROGRAM_FILE_MAX) - #define PAYLOAD_DEPTH (FRAG_ATTRIB_MAX) -diff --git a/src/mesa/drivers/dri/i965/brw_wm_fp.c b/src/mesa/drivers/dri/i965/brw_wm_fp.c -index 203eeea..8bf5579 100644 ---- a/src/mesa/drivers/dri/i965/brw_wm_fp.c -+++ b/src/mesa/drivers/dri/i965/brw_wm_fp.c -@@ -520,6 +520,35 @@ static void precalc_lit( struct brw_wm_c - static void precalc_tex( struct brw_wm_compile *c, - const struct prog_instruction *inst ) - { -+ struct prog_src_register coord; -+ struct prog_dst_register tmpcoord; -+ -+ if (inst->TexSrcTarget == TEXTURE_RECT_INDEX) { -+ struct prog_src_register scale = -+ search_or_add_param6( c, -+ STATE_INTERNAL, -+ STATE_TEXRECT_SCALE, -+ inst->TexSrcUnit, -+ 0,0,0 ); -+ -+ tmpcoord = get_temp(c); -+ -+ /* coord.xy = MUL inst->SrcReg[0], { 1/width, 1/height } -+ */ -+ emit_op(c, -+ OPCODE_MUL, -+ tmpcoord, -+ 0, 0, 0, -+ inst->SrcReg[0], -+ scale, -+ src_undef()); -+ -+ coord = src_reg_from_dst(tmpcoord); -+ } -+ else { -+ coord = inst->SrcReg[0]; -+ } -+ - /* Need to emit YUV texture conversions by hand. Probably need to - * do this here - the alternative is in brw_wm_emit.c, but the - * conversion requires allocating a temporary variable which we -@@ -532,7 +561,7 @@ static void precalc_tex( struct brw_wm_c - inst->SaturateMode, - inst->TexSrcUnit, - inst->TexSrcTarget, -- inst->SrcReg[0], -+ coord, - src_undef(), - src_undef()); - } -@@ -604,7 +633,12 @@ static void precalc_tex( struct brw_wm_c - src_swizzle1(tmpsrc, Z), - src_swizzle1(C1, W), - src_swizzle1(src_reg_from_dst(dst), Y)); -+ -+ release_temp(c, tmp); - } -+ -+ if (inst->TexSrcTarget == GL_TEXTURE_RECTANGLE_NV) -+ release_temp(c, tmpcoord); - } - - -@@ -769,6 +803,27 @@ static void validate_src_regs( struct br - - - -+static void print_insns( const struct prog_instruction *insn, -+ GLuint nr ) -+{ -+ GLuint i; -+ for (i = 0; i < nr; i++, insn++) { -+ _mesa_printf("%3d: ", i); -+ if (insn->Opcode < MAX_OPCODE) -+ _mesa_print_instruction(insn); -+ else if (insn->Opcode < MAX_WM_OPCODE) { -+ GLuint idx = insn->Opcode - MAX_OPCODE; -+ -+ _mesa_print_alu_instruction(insn, -+ wm_opcode_strings[idx], -+ 3); -+ } -+ else -+ _mesa_printf("UNKNOWN\n"); -+ -+ } -+} -+ - void brw_wm_pass_fp( struct brw_wm_compile *c ) - { - struct brw_fragment_program *fp = c->fp; -@@ -867,7 +922,7 @@ void brw_wm_pass_fp( struct brw_wm_compi - - if (INTEL_DEBUG & DEBUG_WM) { - _mesa_printf("\n\n\npass_fp:\n"); --/* _mesa_debug_fp_inst(c->nr_fp_insns, c->prog_instructions, wm_opcode_strings, wm_file_strings); */ -+ print_insns( c->prog_instructions, c->nr_fp_insns ); - _mesa_printf("\n"); - } - } -diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -index 6ccf56e..5c7dc50 100644 ---- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c -@@ -85,7 +85,8 @@ static GLuint translate_tex_format( GLui - return BRW_SURFACEFORMAT_L8A8_UNORM; - - case MESA_FORMAT_RGB888: -- return BRW_SURFACEFORMAT_R8G8B8_UNORM; -+ assert(0); /* not supported for sampling */ -+ return BRW_SURFACEFORMAT_R8G8B8_UNORM; - - case MESA_FORMAT_ARGB8888: - return BRW_SURFACEFORMAT_B8G8R8A8_UNORM; -@@ -93,6 +94,15 @@ static GLuint translate_tex_format( GLui - case MESA_FORMAT_RGBA8888_REV: - return BRW_SURFACEFORMAT_R8G8B8A8_UNORM; - -+ case MESA_FORMAT_RGB565: -+ return BRW_SURFACEFORMAT_B5G6R5_UNORM; -+ -+ case MESA_FORMAT_ARGB1555: -+ return BRW_SURFACEFORMAT_B5G5R5A1_UNORM; -+ -+ case MESA_FORMAT_ARGB4444: -+ return BRW_SURFACEFORMAT_B4G4R4A4_UNORM; -+ - case MESA_FORMAT_YCBCR_REV: - return BRW_SURFACEFORMAT_YCRCB_NORMAL; - -diff --git a/src/mesa/drivers/dri/i965/bufmgr.h b/src/mesa/drivers/dri/i965/bufmgr.h -index 83a810c..6932522 100644 ---- a/src/mesa/drivers/dri/i965/bufmgr.h -+++ b/src/mesa/drivers/dri/i965/bufmgr.h -@@ -182,6 +182,8 @@ void bmUnmapBufferAUB( struct intel_cont - int bmValidateBuffers( struct intel_context * ); - void bmReleaseBuffers( struct intel_context * ); - -+GLuint bmCtxId( struct intel_context *intel ); -+ - - GLboolean bmError( struct intel_context * ); - void bmEvictAll( struct intel_context * ); -diff --git a/src/mesa/drivers/dri/i965/bufmgr_fake.c b/src/mesa/drivers/dri/i965/bufmgr_fake.c -index 8f182f3..30a235a 100644 ---- a/src/mesa/drivers/dri/i965/bufmgr_fake.c -+++ b/src/mesa/drivers/dri/i965/bufmgr_fake.c -@@ -117,6 +117,7 @@ struct bufmgr { - struct block fenced; /* after bmFenceBuffers (mi_flush, emit irq, write dword) */ - /* then to pool->lru or free() */ - -+ unsigned ctxId; - unsigned last_fence; - unsigned free_on_hardware; - -@@ -578,6 +579,12 @@ struct bufmgr *bm_fake_intel_Attach( str - make_empty_list(&bm.referenced); - make_empty_list(&bm.fenced); - make_empty_list(&bm.on_hardware); -+ -+ /* The context id of any of the share group. This won't be used -+ * in communication with the kernel, so it doesn't matter if -+ * this context is eventually deleted. -+ */ -+ bm.ctxId = intel->hHWContext; - } - - nr_attach++; -@@ -1242,7 +1249,6 @@ void bmReleaseBuffers( struct intel_cont - LOCK(bm); - { - struct block *block, *tmp; -- assert(intel->locked); - - foreach_s (block, tmp, &bm->referenced) { - -@@ -1432,3 +1438,9 @@ GLboolean bmError( struct intel_context - - return retval; - } -+ -+ -+GLuint bmCtxId( struct intel_context *intel ) -+{ -+ return intel->bm->ctxId; -+} -diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c -index 2191dd5..b09b0a9 100644 ---- a/src/mesa/drivers/dri/i965/intel_blit.c -+++ b/src/mesa/drivers/dri/i965/intel_blit.c -@@ -74,9 +74,6 @@ void intelCopyBuffer( const __DRIdrawabl - - if (!rect) - { -- /* This is a really crappy way to do wait-for-vblank. I guess -- * it sortof works in the single-application case. -- */ - UNLOCK_HARDWARE( intel ); - driWaitForVBlank( dPriv, &intel->vbl_seq, intel->vblank_flags, & missed_target ); - LOCK_HARDWARE( intel ); -@@ -291,8 +288,12 @@ void intelEmitCopyBlit( struct intel_con - - /* Initial y values don't seem to work with negative pitches. If - * we adjust the offsets manually (below), it seems to work fine. -+ * -+ * On the other hand, if we always adjust, the hardware doesn't -+ * know which blit directions to use, so overlapping copypixels get -+ * the wrong result. - */ -- if (0) { -+ if (dst_pitch > 0 && src_pitch > 0) { - BEGIN_BATCH(8, INTEL_BATCH_NO_CLIPRECTS); - OUT_BATCH( CMD ); - OUT_BATCH( dst_pitch | BR13 ); -diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c -index 59fc807..5f19137 100644 ---- a/src/mesa/drivers/dri/i965/intel_context.c -+++ b/src/mesa/drivers/dri/i965/intel_context.c -@@ -149,6 +149,10 @@ const struct dri_extension card_extensio - { "GL_ARB_texture_env_combine", NULL }, - { "GL_ARB_texture_env_dot3", NULL }, - { "GL_ARB_texture_mirrored_repeat", NULL }, -+ { "GL_ARB_texture_non_power_of_two", NULL }, -+ { "GL_ARB_texture_rectangle", NULL }, -+ { "GL_NV_texture_rectangle", NULL }, -+ { "GL_EXT_texture_rectangle", NULL }, - { "GL_ARB_texture_rectangle", NULL }, - { "GL_ARB_vertex_buffer_object", GL_ARB_vertex_buffer_object_functions }, - { "GL_ARB_vertex_program", GL_ARB_vertex_program_functions }, -@@ -255,10 +259,14 @@ void intelInitDriverFunctions( struct dd - */ - functions->Accum = _swrast_Accum; - functions->Bitmap = _swrast_Bitmap; -- functions->CopyPixels = _swrast_CopyPixels; - functions->ReadPixels = _swrast_ReadPixels; - functions->DrawPixels = _swrast_DrawPixels; - -+ /* CopyPixels can be accelerated even with the current memory -+ * manager: -+ */ -+ functions->CopyPixels = intelCopyPixels; -+ - intelInitTextureFuncs( functions ); - intelInitStateFuncs( functions ); - intelInitBufferFuncs( functions ); -@@ -370,8 +378,6 @@ GLboolean intelInitContext( struct intel - exit(1); - } - -- _math_matrix_ctr (&intel->ViewportMatrix); -- - driInitExtensions( ctx, card_extensions, - GL_TRUE ); - -@@ -446,8 +452,6 @@ GLboolean intelInitContext( struct intel - /* DRI_TEXMGR_DO_TEXTURE_RECT ); */ - - -- intel->prim.primitive = ~0; -- - if (getenv("INTEL_NO_RAST")) { - fprintf(stderr, "disabling 3D rasterization\n"); - intel->no_rast = 1; -@@ -537,18 +541,13 @@ GLboolean intelMakeCurrent(__DRIcontextP - } - - --static void lost_hardware( struct intel_context *intel ) --{ -- bm_fake_NotifyContendedLockTake( intel ); -- intel->vtbl.lost_hardware( intel ); --} -- - static void intelContendedLock( struct intel_context *intel, GLuint flags ) - { - __DRIdrawablePrivate *dPriv = intel->driDrawable; - __DRIscreenPrivate *sPriv = intel->driScreen; - volatile drmI830Sarea * sarea = intel->sarea; - int me = intel->hHWContext; -+ int my_bufmgr = bmCtxId(intel); - - drmGetLock(intel->driFd, intel->hHWContext, flags); - -@@ -562,12 +561,23 @@ static void intelContendedLock( struct i - - - intel->locked = 1; -+ intel->need_flush = 1; - - /* Lost context? - */ - if (sarea->ctxOwner != me) { -+ DBG("Lost Context: sarea->ctxOwner %x me %x\n", sarea->ctxOwner, me); - sarea->ctxOwner = me; -- lost_hardware(intel); -+ intel->vtbl.lost_hardware( intel ); -+ } -+ -+ /* As above, but don't evict the texture data on transitions -+ * between contexts which all share a local buffer manager. -+ */ -+ if (sarea->texAge != my_bufmgr) { -+ DBG("Lost Textures: sarea->texAge %x my_bufmgr %x\n", sarea->ctxOwner, my_bufmgr); -+ sarea->texAge = my_bufmgr; -+ bm_fake_NotifyContendedLockTake( intel ); - } - - /* Drawable changed? -diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h -index 0328cb9..d0354cf 100644 ---- a/src/mesa/drivers/dri/i965/intel_context.h -+++ b/src/mesa/drivers/dri/i965/intel_context.h -@@ -176,16 +176,6 @@ struct intel_context - - struct intel_batchbuffer *batch; - -- struct { -- GLuint id; -- GLuint primitive; -- GLubyte *start_ptr; -- void (*flush)( struct intel_context * ); -- } prim; -- -- GLboolean locked; -- GLboolean strict_conformance; -- - GLubyte clear_chan[4]; - GLuint ClearColor; - GLuint ClearDepth; -@@ -201,6 +191,10 @@ struct intel_context - GLboolean no_hw; - GLboolean no_rast; - GLboolean thrashing; -+ GLboolean locked; -+ GLboolean strict_conformance; -+ GLboolean need_flush; -+ - - - /* AGP memory buffer manager: -@@ -210,26 +204,14 @@ struct intel_context - - /* State for intelvb.c and inteltris.c. - */ -- GLuint RenderIndex; -- GLmatrix ViewportMatrix; - GLenum render_primitive; - GLenum reduced_primitive; -- GLuint vertex_size; -- GLubyte *verts; /* points to tnl->clipspace.vertex_buf */ -- - - struct intel_region *front_region; - struct intel_region *back_region; - struct intel_region *draw_region; - struct intel_region *depth_region; - -- -- /* Fallback rasterization functions -- */ -- intel_point_func draw_point; -- intel_line_func draw_line; -- intel_tri_func draw_tri; -- - /* These refer to the current draw (front vs. back) buffer: - */ - int drawX; /* origin of drawable in draw buffer */ -@@ -496,6 +478,13 @@ extern GLboolean intel_intersect_cliprec - const drm_clip_rect_t *b ); - - -+/* ================================================================ -+ * intel_pixel_copy.c: -+ */ -+void intelCopyPixels(GLcontext * ctx, -+ GLint srcx, GLint srcy, -+ GLsizei width, GLsizei height, -+ GLint destx, GLint desty, GLenum type); - - #define _NEW_WINDOW_POS 0x40000000 - -diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c -new file mode 100644 -index 0000000..ad27867 ---- /dev/null -+++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c -@@ -0,0 +1,239 @@ -+/************************************************************************** -+ * -+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. -+ * All Rights Reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation the rights to use, copy, modify, merge, publish, -+ * distribute, sub license, and/or sell copies of the Software, and to -+ * permit persons to whom the Software is furnished to do so, subject to -+ * the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial portions -+ * of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR -+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ **************************************************************************/ -+ -+#include "glheader.h" -+#include "enums.h" -+#include "image.h" -+#include "mtypes.h" -+#include "macros.h" -+#include "state.h" -+#include "swrast/swrast.h" -+ -+#include "intel_screen.h" -+#include "intel_context.h" -+#include "intel_ioctl.h" -+#include "intel_batchbuffer.h" -+#include "intel_blit.h" -+#include "intel_regions.h" -+ -+ -+static struct intel_region * -+copypix_src_region(struct intel_context *intel, GLenum type) -+{ -+ switch (type) { -+ case GL_COLOR: -+ return intel_readbuf_region(intel); -+ case GL_DEPTH: -+ /* Don't think this is really possible execpt at 16bpp, when we have no stencil. -+ */ -+ if (intel->depth_region && intel->depth_region->cpp == 2) -+ return intel->depth_region; -+ case GL_STENCIL: -+ /* Don't think this is really possible. -+ */ -+ break; -+ case GL_DEPTH_STENCIL_EXT: -+ /* Does it matter whether it is stencil/depth or depth/stencil? -+ */ -+ return intel->depth_region; -+ default: -+ break; -+ } -+ -+ return NULL; -+} -+ -+ -+ -+ -+/** -+ * Check if any fragment operations are in effect which might effect -+ * glDraw/CopyPixels. -+ */ -+static GLboolean -+intel_check_blit_fragment_ops(GLcontext * ctx) -+{ -+ if (ctx->NewState) -+ _mesa_update_state(ctx); -+ -+ /* Could do logicop with the blitter: -+ */ -+ return !(ctx->_ImageTransferState || -+ ctx->Color.AlphaEnabled || -+ ctx->Depth.Test || -+ ctx->Fog.Enabled || -+ ctx->Stencil.Enabled || -+ !ctx->Color.ColorMask[0] || -+ !ctx->Color.ColorMask[1] || -+ !ctx->Color.ColorMask[2] || -+ !ctx->Color.ColorMask[3] || -+ ctx->Color.ColorLogicOpEnabled || -+ ctx->Texture._EnabledUnits || -+ ctx->FragmentProgram._Enabled); -+} -+ -+ -+ -+/** -+ * CopyPixels with the blitter. Don't support zooming, pixel transfer, etc. -+ */ -+static GLboolean -+do_blit_copypixels(GLcontext * ctx, -+ GLint srcx, GLint srcy, -+ GLsizei width, GLsizei height, -+ GLint dstx, GLint dsty, GLenum type) -+{ -+ struct intel_context *intel = intel_context(ctx); -+ struct intel_region *dst = intel_drawbuf_region(intel); -+ struct intel_region *src = copypix_src_region(intel, type); -+ -+ /* Copypixels can be more than a straight copy. Ensure all the -+ * extra operations are disabled: -+ */ -+ if (!intel_check_blit_fragment_ops(ctx) || -+ ctx->Pixel.ZoomX != 1.0F || ctx->Pixel.ZoomY != 1.0F) -+ return GL_FALSE; -+ -+ if (!src || !dst) -+ return GL_FALSE; -+ -+ -+ -+ intelFlush(&intel->ctx); -+ -+/* intel->vtbl.render_start(intel); */ -+/* intel->vtbl.emit_state(intel); */ -+ -+ LOCK_HARDWARE(intel); -+ -+ if (intel->driDrawable->numClipRects) { -+ __DRIdrawablePrivate *dPriv = intel->driDrawable; -+ drm_clip_rect_t *box = dPriv->pClipRects; -+ drm_clip_rect_t dest_rect; -+ GLint nbox = dPriv->numClipRects; -+ GLint delta_x = 0; -+ GLint delta_y = 0; -+ GLuint i; -+ -+ /* Do scissoring in GL coordinates: -+ */ -+ if (ctx->Scissor.Enabled) -+ { -+ GLint x = ctx->Scissor.X; -+ GLint y = ctx->Scissor.Y; -+ GLuint w = ctx->Scissor.Width; -+ GLuint h = ctx->Scissor.Height; -+ GLint dx = dstx - srcx; -+ GLint dy = dsty - srcy; -+ -+ if (!_mesa_clip_to_region(x, y, x+w, y+h, &dstx, &dsty, &width, &height)) -+ goto out; -+ -+ srcx = dstx - dx; -+ srcy = dsty - dy; -+ } -+ -+ /* Convert from GL to hardware coordinates: -+ */ -+ dsty = dPriv->h - dsty - height; -+ srcy = dPriv->h - srcy - height; -+ dstx += dPriv->x; -+ dsty += dPriv->y; -+ srcx += dPriv->x; -+ srcy += dPriv->y; -+ -+ /* Clip against the source region. This is the only source -+ * clipping we do. Dst is clipped with cliprects below. -+ */ -+ { -+ delta_x = srcx - dstx; -+ delta_y = srcy - dsty; -+ -+ if (!_mesa_clip_to_region(0, 0, src->pitch, src->height, -+ &srcx, &srcy, &width, &height)) -+ goto out; -+ -+ dstx = srcx - delta_x; -+ dsty = srcy - delta_y; -+ } -+ -+ dest_rect.x1 = dstx; -+ dest_rect.y1 = dsty; -+ dest_rect.x2 = dstx + width; -+ dest_rect.y2 = dsty + height; -+ -+/* intel->vtbl.emit_flush(intel, 0); */ -+ -+ /* Could do slightly more clipping: Eg, take the intersection of -+ * the existing set of cliprects and those cliprects translated -+ * by delta_x, delta_y: -+ * -+ * This code will not overwrite other windows, but will -+ * introduce garbage when copying from obscured window regions. -+ */ -+ for (i = 0; i < nbox; i++) { -+ drm_clip_rect_t rect; -+ -+ if (!intel_intersect_cliprects(&rect, &dest_rect, &box[i])) -+ continue; -+ -+ -+ intelEmitCopyBlit(intel, -+ dst->cpp, -+ src->pitch, src->buffer, 0, src->tiled, -+ dst->pitch, dst->buffer, 0, dst->tiled, -+ rect.x1 + delta_x, -+ rect.y1 + delta_y, /* srcx, srcy */ -+ rect.x1, rect.y1, /* dstx, dsty */ -+ rect.x2 - rect.x1, rect.y2 - rect.y1); -+ } -+ -+ intel->need_flush = GL_TRUE; -+ out: -+ intel_batchbuffer_flush(intel->batch); -+ } -+ UNLOCK_HARDWARE(intel); -+ return GL_TRUE; -+} -+ -+void -+intelCopyPixels(GLcontext * ctx, -+ GLint srcx, GLint srcy, -+ GLsizei width, GLsizei height, -+ GLint destx, GLint desty, GLenum type) -+{ -+ if (INTEL_DEBUG & DEBUG_PIXEL) -+ fprintf(stderr, "%s\n", __FUNCTION__); -+ -+ if (do_blit_copypixels(ctx, srcx, srcy, width, height, destx, desty, type)) -+ return; -+ -+ if (INTEL_DEBUG & DEBUG_PIXEL) -+ _mesa_printf("fallback to _swrast_CopyPixels\n"); -+ -+ _swrast_CopyPixels(ctx, srcx, srcy, width, height, destx, desty, type); -+} -diff --git a/src/mesa/drivers/dri/i965/intel_span.c b/src/mesa/drivers/dri/i965/intel_span.c -index c68def5..60fbecc 100644 ---- a/src/mesa/drivers/dri/i965/intel_span.c -+++ b/src/mesa/drivers/dri/i965/intel_span.c -@@ -35,6 +35,7 @@ #include "intel_regions.h" - #include "intel_span.h" - #include "intel_ioctl.h" - #include "intel_tex.h" -+#include "intel_batchbuffer.h" - #include "swrast/swrast.h" - - #undef DBG -@@ -207,6 +208,16 @@ void intelSpanRenderStart( GLcontext *ct - { - struct intel_context *intel = intel_context(ctx); - -+ if (intel->need_flush) { -+ LOCK_HARDWARE(intel); -+ intel->vtbl.emit_flush(intel, 0); -+ intel_batchbuffer_flush(intel->batch); -+ intel->need_flush = 0; -+ UNLOCK_HARDWARE(intel); -+ intelFinish(&intel->ctx); -+ } -+ -+ - LOCK_HARDWARE(intel); - - /* Just map the framebuffer and all textures. Bufmgr code will -diff --git a/src/mesa/drivers/dri/i965/intel_state.c b/src/mesa/drivers/dri/i965/intel_state.c -index a471f67..ec6e046 100644 ---- a/src/mesa/drivers/dri/i965/intel_state.c -+++ b/src/mesa/drivers/dri/i965/intel_state.c -@@ -182,39 +182,6 @@ static void intelClearColor(GLcontext *c - } - - --static void intelCalcViewport( GLcontext *ctx ) --{ -- struct intel_context *intel = intel_context(ctx); -- const GLfloat *v = ctx->Viewport._WindowMap.m; -- GLfloat *m = intel->ViewportMatrix.m; -- GLint h = 0; -- -- if (intel->driDrawable) -- h = intel->driDrawable->h + SUBPIXEL_Y; -- -- /* See also intel_translate_vertex. SUBPIXEL adjustments can be done -- * via state vars, too. -- */ -- m[MAT_SX] = v[MAT_SX]; -- m[MAT_TX] = v[MAT_TX] + SUBPIXEL_X; -- m[MAT_SY] = - v[MAT_SY]; -- m[MAT_TY] = - v[MAT_TY] + h; -- m[MAT_SZ] = v[MAT_SZ] * intel->depth_scale; -- m[MAT_TZ] = v[MAT_TZ] * intel->depth_scale; --} -- --static void intelViewport( GLcontext *ctx, -- GLint x, GLint y, -- GLsizei width, GLsizei height ) --{ -- intelCalcViewport( ctx ); --} -- --static void intelDepthRange( GLcontext *ctx, -- GLclampd nearval, GLclampd farval ) --{ -- intelCalcViewport( ctx ); --} - - /* Fallback to swrast for select and feedback. - */ -@@ -228,8 +195,6 @@ static void intelRenderMode( GLcontext * - void intelInitStateFuncs( struct dd_function_table *functions ) - { - functions->RenderMode = intelRenderMode; -- functions->Viewport = intelViewport; -- functions->DepthRange = intelDepthRange; - functions->ClearColor = intelClearColor; - } - -diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c -index 5f65242..91ae097 100644 ---- a/src/mesa/drivers/dri/i965/intel_tex_validate.c -+++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c -@@ -166,12 +166,15 @@ GLuint intel_finalize_mipmap_tree( struc - * target, imageFormat, etc. - */ - if (intelObj->mt && -- (intelObj->mt->first_level != intelObj->firstLevel || -- intelObj->mt->last_level != intelObj->lastLevel || -+ (intelObj->mt->target != intelObj->base.Target || - intelObj->mt->internal_format != firstImage->InternalFormat || -+ intelObj->mt->first_level != intelObj->firstLevel || -+ intelObj->mt->last_level != intelObj->lastLevel || - intelObj->mt->width0 != firstImage->Width || - intelObj->mt->height0 != firstImage->Height || -- intelObj->mt->depth0 != firstImage->Depth)) -+ intelObj->mt->depth0 != firstImage->Depth || -+ intelObj->mt->cpp != firstImage->TexFormat->TexelBytes || -+ intelObj->mt->compressed != firstImage->IsCompressed)) - { - intel_miptree_destroy(intel, intelObj->mt); - intelObj->mt = NULL; -diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c -index 590f357..f999e06 100644 ---- a/src/mesa/shader/program.c -+++ b/src/mesa/shader/program.c -@@ -917,6 +917,15 @@ _mesa_fetch_state(GLcontext *ctx, const - case STATE_NORMAL_SCALE: - ASSIGN_4V(value, ctx->_ModelViewInvScale, 0, 0, 1); - break; -+ case STATE_TEXRECT_SCALE: { -+ const int unit = (int) state[2]; -+ const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current; -+ if (texObj) { -+ struct gl_texture_image *texImage = texObj->Image[0][0]; -+ ASSIGN_4V(value, 1.0 / texImage->Width, 1.0 / texImage->Height, 0, 1); -+ } -+ break; -+ } - default: - _mesa_problem(ctx, "Bad state switch in _mesa_fetch_state()"); - return; -@@ -988,6 +997,8 @@ static GLuint make_state_flags(const GLi - switch (state[1]) { - case STATE_NORMAL_SCALE: - return _NEW_MODELVIEW; -+ case STATE_TEXRECT_SCALE: -+ return _NEW_TEXTURE; - default: - _mesa_problem(NULL, "unexpected int. state in make_state_flags()"); - return 0; -@@ -1450,19 +1461,8 @@ static const struct instruction_info Ins - GLuint - _mesa_num_inst_src_regs(enum prog_opcode opcode) - { -- GLuint i; --#ifdef DEBUG -- for (i = 0; i < MAX_OPCODE; i++) { -- ASSERT(i == InstInfo[i].Opcode); -- } --#endif -- for (i = 0; i < MAX_OPCODE; i++) { -- if (InstInfo[i].Opcode == opcode) { -- return InstInfo[i].NumSrcRegs; -- } -- } -- _mesa_problem(NULL, "invalid opcode in _mesa_num_inst_src_regs"); -- return 0; -+ ASSERT(opcode == InstInfo[opcode].Opcode); -+ return InstInfo[opcode].NumSrcRegs; - } - - -@@ -1601,6 +1601,38 @@ print_src_reg(const struct prog_src_regi - srcReg->NegateBase, GL_FALSE)); - } - -+void -+_mesa_print_alu_instruction(const struct prog_instruction *inst, -+ const char *opcode_string, -+ GLuint numRegs) -+{ -+ GLuint j; -+ -+ _mesa_printf("%s", opcode_string); -+ -+ /* frag prog only */ -+ if (inst->SaturateMode == SATURATE_ZERO_ONE) -+ _mesa_printf("_SAT"); -+ -+ if (inst->DstReg.File != PROGRAM_UNDEFINED) { -+ _mesa_printf(" %s[%d]%s", -+ program_file_string((enum register_file) inst->DstReg.File), -+ inst->DstReg.Index, -+ writemask_string(inst->DstReg.WriteMask)); -+ } -+ -+ if (numRegs > 0) -+ _mesa_printf(", "); -+ -+ for (j = 0; j < numRegs; j++) { -+ print_src_reg(inst->SrcReg + j); -+ if (j + 1 < numRegs) -+ _mesa_printf(", "); -+ } -+ -+ _mesa_printf(";\n"); -+} -+ - - /** - * Print a single vertex/fragment program instruction. -@@ -1662,34 +1694,10 @@ _mesa_print_instruction(const struct pro - /* XXX may need for other special-case instructions */ - default: - /* typical alu instruction */ -- { -- const GLuint numRegs = _mesa_num_inst_src_regs(inst->Opcode); -- GLuint j; -- -- _mesa_printf("%s", _mesa_opcode_string(inst->Opcode)); -- -- /* frag prog only */ -- if (inst->SaturateMode == SATURATE_ZERO_ONE) -- _mesa_printf("_SAT"); -- -- if (inst->DstReg.File != PROGRAM_UNDEFINED) { -- _mesa_printf(" %s[%d]%s", -- program_file_string((enum register_file) inst->DstReg.File), -- inst->DstReg.Index, -- writemask_string(inst->DstReg.WriteMask)); -- } -- -- if (numRegs > 0) -- _mesa_printf(", "); -- -- for (j = 0; j < numRegs; j++) { -- print_src_reg(inst->SrcReg + j); -- if (j + 1 < numRegs) -- _mesa_printf(", "); -- } -- -- _mesa_printf(";\n"); -- } -+ _mesa_print_alu_instruction(inst, -+ _mesa_opcode_string(inst->Opcode), -+ _mesa_num_inst_src_regs(inst->Opcode)); -+ break; - } - } - -diff --git a/src/mesa/shader/program.h b/src/mesa/shader/program.h -index 6a34533..cf3b1cc 100644 ---- a/src/mesa/shader/program.h -+++ b/src/mesa/shader/program.h -@@ -188,6 +188,7 @@ enum state_index { - - STATE_INTERNAL, /* Mesa additions */ - STATE_NORMAL_SCALE, -+ STATE_TEXRECT_SCALE, - STATE_POSITION_NORMALIZED /* normalized light position */ - }; - -@@ -264,6 +265,11 @@ _mesa_load_state_parameters(GLcontext *c - extern void - _mesa_print_instruction(const struct prog_instruction *inst); - -+void -+_mesa_print_alu_instruction(const struct prog_instruction *inst, -+ const char *opcode_string, -+ GLuint numRegs); -+ - extern void - _mesa_print_program(const struct gl_program *prog); - rmfile ./source/x11/xorg-server/post-6.5.1-i965-fixes.patch addfile ./source/x11/xorg-server/xorg-mesa.patch hunk ./source/x11/xorg-server/xorg-mesa.patch 1 +--- xorg-server-1.1.99.903/GL/mesa/main/Makefile.am.orig 2006-12-03 16:24:27.786630074 +0100 ++++ xorg-server-1.1.99.903/GL/mesa/main/Makefile.am 2006-12-03 16:24:37.985074238 +0100 +@@ -60,6 +60,7 @@ + light.c \ + lines.c \ + matrix.c \ ++ mipmap.c \ + mm.c \ + occlude.c \ + pixel.c \ } From krics at linuxforum.hu Tue Dec 5 23:32:46 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 23:32:57 2006 Subject: [Frugalware-darcs] frugalware-current: xf86-input-mouse-1.1.2-2-x86_64 Message-ID: <20061205223246.C7417FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205223154-d209c-e94374a96a12a73340cf20da5fab8a7640864826.gz; [xf86-input-mouse-1.1.2-2-x86_64 Christian Hamar alias krix **20061205223154 * Release bump * Rebuilt with new xorg ] { hunk ./source/x11/xf86-input-mouse/FrugalBuild 6 +pkgrel=2 +pkgdesc="X.org Mouse input driver" hunk ./source/x11/xf86-input-mouse/FrugalBuild 9 -depends=('xorg-server>=1.1.99.901') +depends=('xorg-server>=1.1.99.903') } From krics at linuxforum.hu Tue Dec 5 23:37:10 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 23:37:21 2006 Subject: [Frugalware-darcs] frugalware-current: xf86-input-keyboard-1.1.1-2-x86_64 Message-ID: <20061205223710.9C4C8FA4705@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205223632-d209c-a79d444948f8c710dc7681552c357011b26572a2.gz; [xf86-input-keyboard-1.1.1-2-x86_64 Christian Hamar alias krix **20061205223632 * Release bump * Rebuilt with new xorg ] { hunk ./source/x11/xf86-input-keyboard/FrugalBuild 6 +pkgrel=2 hunk ./source/x11/xf86-input-keyboard/FrugalBuild 8 -depends=('xorg-server>=1.1.99.901') +depends=('xorg-server>=1.1.99.903') +makedepends=('util-macros>=1.1.3' 'randrproto') } From voroskoi at frugalware.org Tue Dec 5 23:39:59 2006 From: voroskoi at frugalware.org (voroskoi) Date: Tue Dec 5 23:40:06 2006 Subject: [Frugalware-darcs] homepage-ng: FSA63-libgsf Message-ID: <20061205223959.EC56BFA470B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20061205223805-dd049-4519d83c822ab836c0c09a6b54005a9008f1f4e0.gz; [FSA63-libgsf voroskoi **20061205223805] { hunk ./frugalware/xml/security.xml 29 + + 63 + 2006-12-05 + voroskoi + libgsf + 1.14.1-3 + 1.14.1-4siwenna1 + http://bugs.frugalware.org/task/1503 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4514 + A vulnerability has been reported in libgsf, which potentially can be exploited by malicious people to compromise an application using the library. + The vulnerability is caused due to a boundary error within the "ole_info_read_metabat()" function in gsf/gsf-infile-msole.c. This can be exploited to cause a heap-based buffer overflow by e.g. tricking a user into opening a specially crafted file in an application using the library. + } From krics at linuxforum.hu Tue Dec 5 23:41:58 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 23:42:07 2006 Subject: [Frugalware-darcs] frugalware-current: xdm-1.1.2-1-x86_64 Message-ID: <20061205224158.383E3FA470B@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205224035-d209c-261a89674f44daafa46258397de93a906240fe8b.gz; [xdm-1.1.2-1-x86_64 Christian Hamar alias krix **20061205224035 * Version bump ] { hunk ./source/x11/xdm/FrugalBuild 5 -pkgver=1.1.0 +pkgver=1.1.2 hunk ./source/x11/xdm/FrugalBuild 11 -depends=('xrdb' 'libxdmcp' 'libxaw' 'xinit' 'libx11' 'libxft' 'xorg-server') +depends=('xrdb' 'libxdmcp' 'libxaw' 'xinit' 'libx11>=1.1.1' 'libxft' 'xorg-server>=1.1.99.903') hunk ./source/x11/xdm/FrugalBuild 16 -sha1sums=('6a940ce1a9adc9652982024f218d76ce7894c0cf' \ +sha1sums=('c7254c2378cde6dd74e4efa3888cce122b9c383e' \ } From krics at linuxforum.hu Tue Dec 5 23:47:18 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 23:47:37 2006 Subject: [Frugalware-darcs] frugalware-current: xf86-video-nv-1.2.1-1-x86_64 Message-ID: <20061205224718.EEB05FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205224638-d209c-9e8cb5264b2ef6166adc557d326924317190ae8b.gz; [xf86-video-nv-1.2.1-1-x86_64 Christian Hamar alias krix **20061205224638 * Version bump ] { hunk ./source/x11/xf86-video-nv/FrugalBuild 5 -pkgver=1.2.0 +pkgver=1.2.1 hunk ./source/x11/xf86-video-nv/FrugalBuild 11 -depends=('xorg-server>=1.1.0') +depends=('xorg-server>=1.1.99.903') hunk ./source/x11/xf86-video-nv/FrugalBuild 14 -sha1sums=('d98cb84e7220251fdcd278c4269763f17aef1e9b') +sha1sums=('8526a967dc393834787a68cbe4b9093611c983fa') } From krics at linuxforum.hu Tue Dec 5 23:52:40 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Tue Dec 5 23:52:54 2006 Subject: [Frugalware-darcs] frugalware-current: xf86-video-tdfx-1.3.0-1-x86_64 Message-ID: <20061205225241.138EAFA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205225200-d209c-c6088966ea397608a0f48952a507d8dca9875100.gz; [xf86-video-tdfx-1.3.0-1-x86_64 Christian Hamar alias krix **20061205225200 * Version bump ] { hunk ./source/x11/xf86-video-tdfx/FrugalBuild 5 -pkgver=1.2.2 +pkgver=1.3.0 hunk ./source/x11/xf86-video-tdfx/FrugalBuild 14 -sha1sums=('3a831921f249574d4a387b7917a39c4b9240fecc') +sha1sums=('8089883c87b64c2876b9152b4820901cc6273f57') } From vmiklos at frugalware.org Tue Dec 5 23:56:57 2006 From: vmiklos at frugalware.org (VMiklos) Date: Tue Dec 5 23:57:02 2006 Subject: [Frugalware-darcs] frugalware-current: xorg.sh: pkgrel is back Message-ID: <20061205225658.BC7AFFA4709@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205223741-e2957-bd0eb9b48fce31283ac3cf908964d5d77fc1f159.gz; [xorg.sh: pkgrel is back VMiklos **20061205223741 ok it's not soo agressive this time ;) ] { hunk ./source/include/xorg.sh 15 + [ -z "$pkgrel" ] && pkgrel=1 } From voroskoi at frugalware.org Tue Dec 5 23:58:46 2006 From: voroskoi at frugalware.org (voroskoi) Date: Tue Dec 5 23:58:51 2006 Subject: [Frugalware-darcs] homepage-ng: FSA64-tar Message-ID: <20061205225846.E5583FA470F@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20061205225806-dd049-8cb3e48bdfd763d6d93d345024a6e9a0c441ee9a.gz; [FSA64-tar voroskoi **20061205225806] { hunk ./frugalware/xml/security.xml 29 + + 64 + 2006-12-05 + voroskoi + tar + 1.15.1-4 + 1.15.1-5siwenna1 + http://bugs.frugalware.org/task/1496 + http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-6097 + Teemu Salmela has reported a security issue in GNU tar, which can be exploited by malicious people to overwrite arbitrary files. + The security issue is caused due to the "extract_archive()" function in extract.c and the "extract_mangle()" function in mangle.c still processing the deprecated "GNUTYPE_NAMES" record type containing symbolic links. This can be exploited to overwrite arbitrary files by e.g. tricking a user into unpacking a specially crafted tar file. + } From voroskoi at frugalware.org Wed Dec 6 00:04:29 2006 From: voroskoi at frugalware.org (voroskoi) Date: Wed Dec 6 00:04:32 2006 Subject: [Frugalware-darcs] frugalware-0.5: gnupg-1.4.5-2siwenna1-i686 Message-ID: <20061205230429.DD16DFA4708@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20061204161758-dd049-e524190b985be7e7e49c69141800684df152b115.gz; [gnupg-1.4.5-2siwenna1-i686 voroskoi **20061204161758 secfix relbump, closes #1497 ] { addfile ./source/apps/gnupg/CVE-2006-6169.diff hunk ./source/apps/gnupg/CVE-2006-6169.diff 1 +--- STABLE-BRANCH-1-4/g10/openfile.c 2006/08/01 12:22:38 4215 ++++ STABLE-BRANCH-1-4/g10/openfile.c 2006/11/27 16:40:14 4349 +@@ -144,8 +144,8 @@ + + s = _("Enter new filename"); + +- n = strlen(s) + namelen + 10; + defname = name && namelen? make_printable_string( name, namelen, 0): NULL; ++ n = strlen(s) + (defname?strlen (defname):0) + 10; + prompt = xmalloc(n); + if( defname ) + sprintf(prompt, "%s [%s]: ", s, defname ); hunk ./source/apps/gnupg/FrugalBuild 1 -# Last Modified: Wed, 02 Aug 2006 14:54:01 +0200 hunk ./source/apps/gnupg/FrugalBuild 6 -pkgrel=1 +pkgrel=2siwenna1 hunk ./source/apps/gnupg/FrugalBuild 13 -source=(ftp://ftp.gnupg.org/GnuPG/gnupg/$pkgname-$pkgver.tar.gz) -signatures=($source.sig) +source=(ftp://ftp.gnupg.org/GnuPG/gnupg/$pkgname-$pkgver.tar.gz CVE-2006-6169.diff) +signatures=($source.sig '') } From krics at linuxforum.hu Wed Dec 6 00:16:44 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 6 00:17:02 2006 Subject: [Frugalware-darcs] frugalware-current: xf86-video-vesa-1.3.0-1-x86_64 Message-ID: <20061205231644.81963FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205225947-d209c-708cfb8c7dbe922ec77fa270062e7413c42fd25a.gz; [xf86-video-vesa-1.3.0-1-x86_64 Christian Hamar alias krix **20061205225947 * Version bump ] { hunk ./source/x11/xf86-video-vesa/FrugalBuild 5 -pkgver=1.2.2 +pkgver=1.3.0 hunk ./source/x11/xf86-video-vesa/FrugalBuild 14 -sha1sums=('aa22994fac3dadf41b7b641a816f704129831a77') +sha1sums=('09d74f838c07c58b6eba3600f3afa5fb74420ff4') } From voroskoi at frugalware.org Wed Dec 6 00:23:33 2006 From: voroskoi at frugalware.org (voroskoi) Date: Wed Dec 6 00:23:36 2006 Subject: [Frugalware-darcs] homepage-ng: FSA65-kdegraphics Message-ID: <20061205232333.25735FA470C@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=homepage-ng;a=darcs_commitdiff;h=20061205232246-dd049-13950a6bfcc4233fd4addb33b73cd2f4e1f18c3a.gz; [FSA65-kdegraphics voroskoi **20061205232246] { hunk ./frugalware/xml/security.xml 29 + + 65 + 2006-12-06 + voroskoi + kdegraphics + 3.5.4-3 + 3.5.4-4siwenna1 + http://bugs.frugalware.org/task/1507 + There is no CVE for this issue, see: http://secunia.com/advisories/23203 + A weakness has been reported in KDE, which can be exploited by malicious people to cause a DoS (Denial of Service). + The weakness is caused due to an error within the JPEG kfile-info plugin when parsing EXIF information. This can be exploited to cause an endless recursion by e.g. tricking a user into opening a specially crafted file with an application using the kfile-info plugin. + + } From krics at linuxforum.hu Wed Dec 6 00:26:31 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 6 00:26:40 2006 Subject: [Frugalware-darcs] frugalware-current: mkfontscale-1.0.3-1-x86_64 Message-ID: <20061205232632.1D4B6FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205232534-d209c-57692c6cb42fd34ea2d5dab8d6c6dacb91de69f3.gz; [mkfontscale-1.0.3-1-x86_64 Christian Hamar alias krix **20061205232534 * Version bump ] { hunk ./source/x11/mkfontscale/FrugalBuild 5 -pkgver=1.0.2 +pkgver=1.0.3 hunk ./source/x11/mkfontscale/FrugalBuild 14 -sha1sums=('9e33720a3c60b8cded82301a4b0e5d01a231e46c') +sha1sums=('f635e66e8fc214a52c29c7fcb459fb65ba4ce1e4') } From krics at linuxforum.hu Wed Dec 6 00:33:40 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 6 00:33:54 2006 Subject: [Frugalware-darcs] frugalware-current: encodings-1.0.2-1-x86_64 Message-ID: <20061205233341.4F174FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205233245-d209c-3e870974fde131c680c47f8c62e2a878646ec6fd.gz; [encodings-1.0.2-1-x86_64 Christian Hamar alias krix **20061205233245 * Version bump ] { hunk ./source/x11/encodings/FrugalBuild 5 -pkgver=1.0.1 +pkgver=1.0.2 hunk ./source/x11/encodings/FrugalBuild 11 -depends=('mkfontscale') +depends=('mkfontscale>=1.0.3') hunk ./source/x11/encodings/FrugalBuild 13 -sha1sums=('2137e027a4863c1748286382603bdb27b640e2cd') +sha1sums=('63622374470204f6501ffb5f4df84228d859c9cf') } From voroskoi at frugalware.org Wed Dec 6 00:33:44 2006 From: voroskoi at frugalware.org (voroskoi) Date: Wed Dec 6 00:33:56 2006 Subject: [Frugalware-darcs] frugalware-current: proftpd-1.3.0-4-i686 Message-ID: <20061205233345.D743FFA470E@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205233211-dd049-e2582270f92247912583e0a8fc5b595fcbef26b4.gz; [proftpd-1.3.0-4-i686 voroskoi **20061205233211 secfix relbump, closes #1499 ] { addfile ./source/network/proftpd/proftpd_mod_tls.patch hunk ./source/network/proftpd/FrugalBuild 8 -pkgrel=3 +pkgrel=4 hunk ./source/network/proftpd/FrugalBuild 18 - rc.proftpd proftpd.conf ftpusers cmd_loop_fix.patch) + rc.proftpd proftpd.conf ftpusers cmd_loop_fix.patch proftpd_mod_tls.patch) hunk ./source/network/proftpd/FrugalBuild 35 - '3c825dfbb08a45c4927e61b90f74a86267f21128') + '3c825dfbb08a45c4927e61b90f74a86267f21128' \ + 'd418b86d3279bba16854db5a96543c363425bfd8') hunk ./source/network/proftpd/proftpd_mod_tls.patch 1 +Index: contrib/mod_tls.c +--- proftpd/contrib/mod_tls.c.orig 2005-11-08 18:59:49 +0100 ++++ proftpd/contrib/mod_tls.c 2006-11-15 17:54:43 +0100 +@@ -2421,6 +2421,8 @@ + datalen = BIO_get_mem_data(mem, &data); + + if (data) { ++ if (datalen > sizeof(buf)-1) ++ datalen = sizeof(buf)-1; + memset(&buf, '\0', sizeof(buf)); + memcpy(buf, data, datalen); + buf[datalen] = '\0'; } From krics at linuxforum.hu Wed Dec 6 00:42:01 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 6 00:42:22 2006 Subject: [Frugalware-darcs] frugalware-current: libxdamage-1.0.4-1-x86_64 Message-ID: <20061205234201.AEB00FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205234012-d209c-5fe7f112265511bc12b1fc3507a808d5f96b24a7.gz; [libxdamage-1.0.4-1-x86_64 Christian Hamar alias krix **20061205234012 * Version bump ] { hunk ./source/x11/libxdamage/FrugalBuild 6 -pkgver=1.0.3 +pkgver=1.0.4 hunk ./source/x11/libxdamage/FrugalBuild 12 -depends=('libx11' 'libxfixes' 'damageproto' 'xproto') +depends=('libx11>=1.1.1' 'libxfixes>=4.0.3' 'damageproto' 'xproto') hunk ./source/x11/libxdamage/FrugalBuild 16 -sha1sums=('be9513ffe0429b2872b20eae7a8315df186a712a') +sha1sums=('7bed679e1ecf74421fdf2feb6d153298348d9629') } From krics at linuxforum.hu Wed Dec 6 00:50:34 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 6 00:50:48 2006 Subject: [Frugalware-darcs] frugalware-current: luit-1.0.2-1-x86_64 Message-ID: <20061205235034.57917FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205234949-d209c-0b96b7f83939c99cb102e7686e1dfb366da49751.gz; [luit-1.0.2-1-x86_64 Christian Hamar alias krix **20061205234949 * Version bump ] { hunk ./source/x11/luit/FrugalBuild 5 -pkgver=1.0.1 +pkgver=1.0.2 hunk ./source/x11/luit/FrugalBuild 11 -depends=('libx11' 'libfontenc') +depends=('libx11>=1.1.1' 'libfontenc') +makedepends=('inputproto') hunk ./source/x11/luit/FrugalBuild 14 +sha1sums=('0b811edc2b1cf11716cb24c468613622e72ebf35') hunk ./source/x11/luit/FrugalBuild 16 -# optimalization OK - -# vim: ft=sh -sha1sums=('47f311e809649e772a6cef6902f47fb567625253') -makedepends=('inputproto') +# optimization OK } From voroskoi at frugalware.org Wed Dec 6 00:53:51 2006 From: voroskoi at frugalware.org (voroskoi) Date: Wed Dec 6 00:53:55 2006 Subject: [Frugalware-darcs] frugalware-0.5: lha-1.14i_ac20050924p1-1siwenna1-i686 Message-ID: <20061205235351.7FC32FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20061205235006-dd049-7e210a1999d3f21fbc642e086026000925f59d7e.gz; [lha-1.14i_ac20050924p1-1siwenna1-i686 voroskoi **20061205235006 secfix bump, closes #1501 ] { hunk ./source/base/lha/FrugalBuild 1 -# Last Modified: Sat, 04 Mar 2006 01:13:27 +0100 -# Compiling Time: 0.01 SBU +# Compiling Time: 0.09 SBU hunk ./source/base/lha/FrugalBuild 5 -pkgver=114i -pkgrel=1 +pkgver=1.14i_ac20050924p1 +rel_id=22231 +pkgrel=1siwenna1 hunk ./source/base/lha/FrugalBuild 13 -up2date="lynx -dump http://quox.org/install/archiver/lha.html|grep Version -1|sed -n 's/.*]\([0-9a-z\.]*\) .*/\1/;s/\.//;$ p'" -source=(http://www2m.biglobe.ne.jp/~dolphin/lha/prog/$pkgname-$pkgver.tar.gz) -sha1sums=('79e35271f2cf783f946db3f22e304fef72dbac99') - -build() -{ - Fcd - Fsed "^\(OPTIMIZE\t=\).*" "\1 $CFLAGS" Makefile - Fmake || return 1 - Fexerel src/lha /usr/bin/lha -} - -# optimization ok +up2date="elinks -dump http://sourceforge.jp/projects/lha/files/|grep tar.gz$|sed 's/.*lha-\(.*\)\.t.*/\1/;s/-/_/;q'" +source=(http://osdn.dl.sourceforge.jp/$pkgname/$rel_id/$pkgname-${pkgver/_/-}.tar.gz) +# this can be removed after Frugalware 0.6 +options=('force') +_F_cd_path="$pkgname-${pkgver/_/-}" +# optimization OK +sha1sums=('2491c8b584c21759f1d3819f57fa0e1cbc235092') } From krics at linuxforum.hu Wed Dec 6 01:00:32 2006 From: krics at linuxforum.hu (Christian Hamar alias krix) Date: Wed Dec 6 01:00:38 2006 Subject: [Frugalware-darcs] frugalware-current: xf86-input-evdev-1.1.4-1-x86_64 Message-ID: <20061206000032.D7FC2FA46FF@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205235936-d209c-19b3dc5d71ff74d194010e0257b11f1719465614.gz; [xf86-input-evdev-1.1.4-1-x86_64 Christian Hamar alias krix **20061205235936 * Version bump ] { hunk ./source/x11/xf86-input-evdev/FrugalBuild 5 -pkgver=1.1.2 +pkgver=1.1.4 +pkgrel=1 hunk ./source/x11/xf86-input-evdev/FrugalBuild 8 -sha1sums=('a0b3675f8fd2da6b5f70989c66e77f2d84f23aed') +sha1sums=('0a217bba51eb88897de3d056de3b1925a2ce30b8') } From vmiklos at frugalware.org Wed Dec 6 01:01:01 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Dec 6 01:01:04 2006 Subject: [Frugalware-darcs] frugalware-current: gtkpod-0.99.8-1-i686 Message-ID: <20061206000101.333E8FA4712@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205233525-e2957-41ee0740a9edf98fb785d077c2a8b9dc809db2c9.gz; [gtkpod-0.99.8-1-i686 VMiklos **20061205233525 source(), up2date -> Finclude sourceforge ] { hunk ./source/xapps-extra/gtkpod/FrugalBuild 8 +_F_sourceforge_prefix="gtkpod-" +Finclude sourceforge hunk ./source/xapps-extra/gtkpod/FrugalBuild 14 -up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=67873 |grep -m1 'gtkpod-[0-9]'|sed 's/.*od-//g'|sed 's/ .*//g'" -source=(http://heanet.dl.sourceforge.net/sourceforge/gtkpod/gtkpod-$pkgver.tar.gz) } From vmiklos at frugalware.org Wed Dec 6 01:01:02 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Dec 6 01:01:07 2006 Subject: [Frugalware-darcs] frugalware-current: testsuite/sourceforge: new test Message-ID: <20061206000102.A01B6FA4711@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061206000017-e2957-8d0c98c23fa566e6fac0692d0d94652eb9e8f54b.gz; [testsuite/sourceforge: new test VMiklos **20061206000017] { addfile ./testsuite/sourceforge hunk ./testsuite/sourceforge 1 +#!/bin/bash + +if [ "$1" == "--help" ]; then + echo "packages with a hardwired sourceforge mirror" + exit 1 +fi + +find ../source -name FrugalBuild |xargs grep 'http://.\+dl.sourceforge.net' \ + |sed 's|.*/\([^/]*\)/FrugalBuild.*|\1|'|sort -u } From vmiklos at frugalware.org Wed Dec 6 01:01:04 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Dec 6 01:01:13 2006 Subject: [Frugalware-darcs] frugalware-current: guiloader-2.8.0-1-i686 Message-ID: <20061206000106.71272501576@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205234447-e2957-1ffc0dbc81c175d762c1903d84b3eba4eb1a3940.gz; [guiloader-2.8.0-1-i686 VMiklos **20061205234447 use Finclude sourceforge fix sbu ] { hunk ./source/devel-extra/guiloader/FrugalBuild 1 -# Compiling Time: 0.05 SBU +# Compiling Time: 0.05 SBU hunk ./source/devel-extra/guiloader/FrugalBuild 8 +_F_sourceforge_dirname="gideon" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/devel-extra/guiloader/FrugalBuild 16 -source=(http://heanet.dl.sourceforge.net/sourceforge/gideon/$pkgname-$pkgver.tar.bz2) } From vmiklos at frugalware.org Wed Dec 6 01:01:07 2006 From: vmiklos at frugalware.org (VMiklos) Date: Wed Dec 6 01:01:15 2006 Subject: [Frugalware-darcs] frugalware-current: hk_classes-0.8.2-1-i686 Message-ID: <20061206000107.6ADC5501574@genesis.frugalware.org> Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061205234721-e2957-ec19d59600c85ba49a45f73d4da23261d0fb91cd.gz; [hk_classes-0.8.2-1-i686 VMiklos **20061205234721 use Finclude sourceforge ] { hunk ./source/lib-extra/hk_classes/FrugalBuild 8 +_F_sourceforge_dirname="hk-classes" +_F_sourceforge_ext=".tar.bz2" +Finclude sourceforge hunk ./source/lib-extra/hk_classes/FrugalBuild 15 -source=(http://heanet.dl.sourceforge.net/sourceforge/hk-classes/$pkgname-$pkgver.tar.bz2) } From vmikl