X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fmunge-ad.pl;h=4f44a8eb3fda400041928e1fa7b0cdcc6d543f56;hb=ec8d2b32b63649e6d32bdfb306eda062769af823;hp=12f923dce3b5969b4a37f5fde14f08f40a64ef05;hpb=7b34ef992563d7bcbb64cc5597dc45fa24470b05;p=xscreensaver

diff --git a/hacks/munge-ad.pl b/hacks/munge-ad.pl
index 12f923dc..4f44a8eb 100755
--- a/hacks/munge-ad.pl
+++ b/hacks/munge-ad.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2008 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2008-2011 Jamie Zawinski <jwz@jwz.org>
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -18,7 +18,7 @@ use diagnostics;
 use strict;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.3 $ }; $version =~ s/^[^\d]+([\d.]+).*/$1/;
+my $version = q{ $Revision: 1.7 $ }; $version =~ s/^[^\d]+([\d.]+).*/$1/;
 
 my $verbose = 0;
 
@@ -27,32 +27,23 @@ my $verbose = 0;
 #
 my %disable = ( 
    'abstractile'	=> 1,
-   'ant'		=> 1,
    'antinspect'		=> 1,
    'antmaze'		=> 1,
    'antspotlight'	=> 1,
    'braid'		=> 1,
-   'critical'		=> 1,
    'crystal'		=> 1,
    'demon'		=> 1,
    'dnalogo'		=> 1,
    'fadeplot'		=> 1,
    'glblur'		=> 1,
-   'glforestfire'	=> 1,
    'glplanet'		=> 1,
    'glslideshow'	=> 1,
-   'hyperball'		=> 1,
-   'hypercube'		=> 1,
    'jigglypuff'		=> 1,
-   'juggle'		=> 1,
+   'juggle'		=> 2,
    'kaleidescope'	=> 1,
-   'laser'		=> 1,
    'lcdscrub'		=> 1,
-   'lightning'		=> 1,
-   'lisa'		=> 1,
-   'lissie'		=> 1,
-   'lmorph'		=> 1,
    'loop'		=> 1,
+   'mismunch'		=> 2,
    'nerverot'		=> 1,
    'noseguy'		=> 1,
    'polyominoes'	=> 1,
@@ -60,16 +51,11 @@ my %disable = (
    'pyro'		=> 1,
    'rdbomb'		=> 2,  # alternate name
    'rocks'		=> 1,
-   'rotor'		=> 1,
    'sballs'		=> 1,
    'sierpinski'		=> 1,
-   'sphere'		=> 1,
-   'spiral'		=> 1,
    'thornbird'		=> 1,
    'vidwhacker'		=> 1,
-   'vines'		=> 1,
    'webcollage'		=> 1,
-   'worm'		=> 1,
    'xsublim'		=> 2,
   );
 
@@ -85,8 +71,10 @@ sub parse_makefiles() {
     close IN;
 
     $body =~ s/\\\n//gs;
-    my ($var) = ($body =~ m/^RETIRED_EXES\s*=\s*(.*)$/mi);
+    my ($var)  = ($body =~ m/^RETIRED_EXES\s*=\s*(.*)$/mi);
+    my ($var2) = ($body =~ m/^RETIRED_GL_EXES\s*=\s*(.*)$/mi);
     error ("no RETIRED_EXES in $mf") unless $var;
+    $var .= " $var2" if $var2;
     foreach my $hack (split (/\s+/, $var)) {
       $disable{$hack} = 2;
     }
@@ -167,6 +155,7 @@ sub munge_ad($) {
     my $glep = ($hack eq 'extrusion');
     if (-f "$hack.c" || -f "$hack") { $glp = 0; }
     elsif (-f "glx/$hack.c") { $glp = 1; }
+    elsif ($hack eq 'companioncube') { $glp = 1; }  # kludge
     elsif ($dis != 2) { error ("is $hack X or GL?"); }
 
     $counts[($disable{$hack} || 0)]++;