...
 
Commits (4)
......@@ -18,25 +18,25 @@ ridiculously long list of steps!
3: Delete the dangerball.c and dangerball.xml files from Build Phases.
4: Delete the "DangerBall copy-Info.plist" file that got created.
5: Delete the "DangerBall copy-Info.plist" from the Build Settings too.
6: -
7: Manage Schemes, rename "DangerBall Copy".
8: Move to the right place in the list.
9: Scheme / Run / Info: Executable: SaverTester.app.
10: Scheme / Run / Arguments: set SELECTED_SAVER environment variable.
11: File / Add Files / the new .c and .xml.
12: Select each file in the left pane; see Target Membership in the right
pane and add them to the new target, and to "XScreenSaver-iOS".
13: Re-order them in the file list.
14: In target "All Savers (OpenGL)" add the new target as Build Phases /
6: Manage Schemes, rename "DangerBall Copy".
7: Move to the right place in the list.
8: Scheme / Run / Info: Executable: SaverTester.app.
9: Scheme / Run / Arguments: set SELECTED_SAVER environment variable.
10: File / Add Files / the new .c and .xml.
11: Re-order them in the file list. This will bring up an Options dialog.
Add To Targets: the new target, and "XScreenSaver-iOS".
12: The files might not have moved. This means Xcode is gonna crash soon.
It will repair itself after.
13: In target "All Savers (OpenGL)" add the new target as Build Phases /
Target Dependency.
15: In target "XScreenSaver-iOS", reorder new files in Build Phases /
14: In target "XScreenSaver-iOS", reorder new files in Build Phases /
"Copy" and "Compile", since they showed up in a random place.
16: In target "XScreenSaver-iOS", add "-DUSE_GL" to the new file's options.
17: Put a 200x150 screen shot in ~/www/xscreensaver/screenshots/
18: ln -s ../../src/xscreensaver/OSX/build/Debug/NEW.saver \
15: In target "XScreenSaver-iOS", add "-DUSE_GL" to the new file's options.
16: Put a 200x150 screen shot in ~/www/xscreensaver/screenshots/
17: ln -s ../../src/xscreensaver/OSX/build/Debug/NEW.saver \
~/Library/Screen\ Savers/
19: git add xscreensaver.xcodeproj/xcuserdata/*/xcschemes/*.xcscheme
20: Don't forget to create a man page from the XML with xml2man.pl,
18: git add xscreensaver.xcodeproj/xcuserdata/*/xcschemes/*.xcscheme
19: Don't forget to create a man page from the XML with xml2man.pl,
and update Makefile.in.
21: Make a video: -record-animation 3600 -delay 1 -geom 1920x1080+128+64
20: Make a video: -record-animation 3600 -delay 1 -geom 1920x1080+128+64
./upload-video.pl NAME
......@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleIconFile</key>
<string>SaverRunner</string>
<key>CFBundleIdentifier</key>
......@@ -15,21 +15,21 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>5.39</string>
<string>5.40</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>
<string>5.39</string>
<string>5.40</string>
<key>NSMainNibFile</key>
<string>SaverRunner</string>
<key>NSPrincipalClass</key>
......
......@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleIconFile</key>
<string>SaverRunner</string>
<key>CFBundleIdentifier</key>
......@@ -17,23 +17,23 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>5.39</string>
<string>5.40</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>LSUIElement</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>5.39</string>
<string>5.40</string>
<key>NSMainNibFile</key>
<string>Updater</string>
<key>NSPrincipalClass</key>
......
......@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>5.39</string>
<string>5.40</string>
<key>LSMinimumSystemVersion</key>
<string>10.8</string>
<key>NSMainNibFile</key>
......
......@@ -16,8 +16,8 @@
\b0 by Jamie Zawinski\
and many others\
\
version 5.39\
12-Apr-2018\
version 5.40\
12-Aug-2018\
\
{\field{\*\fldinst{HYPERLINK "https://www.jwz.org/xscreensaver/"}}{\fldrslt \cf2 \ul \ulc2 https://www.jwz.org/xscreensaver/}}\
\pard\pardeftab720
......
#!/usr/bin/perl -w
# Copyright © 2012-2015 Jamie Zawinski <jwz@jwz.org>
# Copyright © 2012-2018 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
......@@ -23,7 +23,7 @@ require 5;
use strict;
my $progname = $0; $progname =~ s@.*/@@g;
my ($version) = ('$Revision: 1.5 $' =~ m/\s(\d[.\d]+)\s/s);
my ($version) = ('$Revision: 1.6 $' =~ m/\s(\d[.\d]+)\s/s);
my $verbose = 1;
......@@ -31,6 +31,7 @@ my $verbose = 1;
#
my %disable = (
'extrusion' => 1,
'glitchpeg' => 1,
'lcdscrub' => 1,
'lockward' => 1,
'webcollage' => 1,
......
/* xscreensaver, Copyright (c) 1992-2017 Jamie Zawinski <jwz@jwz.org>
/* xscreensaver, Copyright (c) 1992-2018 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
......@@ -342,6 +342,7 @@ osx_grab_desktop_image (Screen *screen, Window xwindow, Drawable drawable,
(NSString *)kCGWindowNumber]).intValue;
}
}
CFRelease (L);
}
// Grab a screen shot of those windows below this one
......
......@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleIcons</key>
<dict/>
<key>CFBundleIcons~ipad</key>
......@@ -19,21 +19,21 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>5.39</string>
<string>5.40</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>5.39</string>
<string>5.40</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>5.39</string>
<string>5.40</string>
<key>NSMainNibFile</key>
<string>iSaverRunner</string>
<key>UIAppFonts</key>
......
/* Generated file, do not edit.
Created: Tue Apr 10 17:04:05 2018 by build-fntable.pl 1.5.
Created: Sat Aug 4 21:35:23 2018 by build-fntable.pl 1.6.
*/
#import <Foundation/Foundation.h>
......@@ -75,6 +75,7 @@ extern struct xscreensaver_function_table
euler2d_xscreensaver_function_table,
fadeplot_xscreensaver_function_table,
fiberlamp_xscreensaver_function_table,
filmleader_xscreensaver_function_table,
fireworkx_xscreensaver_function_table,
flame_xscreensaver_function_table,
flipflop_xscreensaver_function_table,
......@@ -217,6 +218,7 @@ extern struct xscreensaver_function_table
unicrud_xscreensaver_function_table,
unknownpleasures_xscreensaver_function_table,
vermiculate_xscreensaver_function_table,
vfeedback_xscreensaver_function_table,
vigilance_xscreensaver_function_table,
voronoi_xscreensaver_function_table,
wander_xscreensaver_function_table,
......@@ -312,6 +314,7 @@ NSDictionary *make_function_table_dict(void)
[NSValue valueWithPointer:&euler2d_xscreensaver_function_table], @"euler2d",
[NSValue valueWithPointer:&fadeplot_xscreensaver_function_table], @"fadeplot",
[NSValue valueWithPointer:&fiberlamp_xscreensaver_function_table], @"fiberlamp",
[NSValue valueWithPointer:&filmleader_xscreensaver_function_table], @"filmleader",
[NSValue valueWithPointer:&fireworkx_xscreensaver_function_table], @"fireworkx",
[NSValue valueWithPointer:&flame_xscreensaver_function_table], @"flame",
[NSValue valueWithPointer:&flipflop_xscreensaver_function_table], @"flipflop",
......@@ -454,6 +457,7 @@ NSDictionary *make_function_table_dict(void)
[NSValue valueWithPointer:&unicrud_xscreensaver_function_table], @"unicrud",
[NSValue valueWithPointer:&unknownpleasures_xscreensaver_function_table], @"unknownpleasures",
[NSValue valueWithPointer:&vermiculate_xscreensaver_function_table], @"vermiculate",
[NSValue valueWithPointer:&vfeedback_xscreensaver_function_table], @"vfeedback",
[NSValue valueWithPointer:&vigilance_xscreensaver_function_table], @"vigilance",
[NSValue valueWithPointer:&voronoi_xscreensaver_function_table], @"voronoi",
[NSValue valueWithPointer:&wander_xscreensaver_function_table], @"wander",
......
......@@ -7,6 +7,17 @@
<link>https://www.jwz.org/xscreensaver/updates.xml</link>
<description>Updates to xscreensaver.</description>
<language>en</language>
<item>
<title>Version 5.39</title>
<link>https://www.jwz.org/xscreensaver/xscreensaver-5.39.dmg</link>
<description><![CDATA[&bull; New hacks, 'razzledazzle', 'peepers', 'crumbler' and `maze3d'. <BR>&bull; More heuristics for using RSS feeds as image sources. <BR>&bull; Android: Image loading works. <BR>&bull; Built-in image assets are now PNG instead of XPM or XBM. <BR>&bull; X11: Better font-loading fallback heuristics on systems with a terrible selection of installed fonts. <BR>&bull; macOS: Retina display-related bug fixes.]]></description>
<pubDate>Thu, 12 Apr 2018 13:00:37 -0700</pubDate>
<enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.39.dmg"
sparkle:version="5.39"
sparkle:dsaSignature="MC0CFCNqDWYNT+EDQXEpi0SAxySC77A+AhUArqhfa7sp5J8cXq42u5uFmBOQiFA="
length="32888133"
type="application/octet-stream" />
</item>
<item>
<title>Version 5.38</title>
<link>https://www.jwz.org/xscreensaver/xscreensaver-5.38.dmg</link>
......@@ -29,17 +40,6 @@
length="52481386"
type="application/octet-stream" />
</item>
<item>
<title>Version 5.36</title>
<link>https://www.jwz.org/xscreensaver/xscreensaver-5.36.dmg</link>
<description><![CDATA[&bull; New hacks, `discoball', `cubetwist', `cubestack', `splodesic' and `hexstrut'. <BR>&bull; macOS: loading image files works in `dymaxionmap', `glplanet', `lavalite', `pulsar', `gleidescope' and `extrusion'. <BR>&bull; Several new programs in `m6502'. <BR>&bull; `rotzoomer -mode circle'. <BR>&bull; Better titles in `photopile'.]]></description>
<pubDate>Mon, 10 Oct 2016 19:59:35 -0700</pubDate>
<enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.36.dmg"
sparkle:version="5.36"
sparkle:dsaSignature="MC0CFE0PgizuGmjl0jbR0M5eu1KLU/XhAhUAj/D/h9i70tfjBehPoCxMoBakBSA="
length="52105511"
type="application/octet-stream" />
</item>
<item>
<title>Version 5.34</title>
<link>https://www.jwz.org/xscreensaver/xscreensaver-5.34.dmg</link>
......
This diff is collapsed.
......@@ -46,6 +46,18 @@ XScreenSaver has an extensive manual -- please read it!
===============================================================================
5.40 * New hacks, 'filmleader', 'vfeedback'.
* New hack, 'glitchpeg' (X11 and macOS only).
* GLPlanet blends between day and night maps at the dusk terminator.
* DymaxionMap can display arbitrary map images, and animate sunlight
across the flattened globe.
* Tessellimage can draw either Delaunay or Voronoi tilings.
* XAnalogTV includes test cards.
* Android: These hacks work now: 'blitspin', 'bumps', 'cityflow',
'endgame', 'esper', 'flipscreen3d', 'gleidescope', 'glslideshow',
'jigglypuff', 'queens', 'tessellimage', 'xanalogtv', 'xmatrix',
'zoom'.
5.39 * New hacks, 'razzledazzle', 'peepers', 'crumbler' and `maze3d'.
* More heuristics for using RSS feeds as image sources.
* Android: Image loading works.
......
......@@ -49,6 +49,7 @@ export ANDROID_HACKS= \
binaryring \
blaster \
blinkbox \
blitspin \
blocktube \
boing \
bouboule \
......@@ -57,10 +58,12 @@ export ANDROID_HACKS= \
boxfit \
braid \
bsod \
bumps \
cage \
ccurve \
celtic \
circuit \
cityflow \
cloudlife \
companioncube \
compass \
......@@ -87,16 +90,20 @@ export ANDROID_HACKS= \
dnalogo \
drift \
dymaxionmap \
endgame \
energystream \
engine \
epicycle \
eruption \
esper \
euler2d \
fadeplot \
fiberlamp \
filmleader \
fireworkx \
flame \
flipflop \
flipscreen3d \
flow \
fluidballs \
flyingtoasters \
......@@ -108,11 +115,13 @@ export ANDROID_HACKS= \
gflux \
glblur \
glcells \
gleidescope \
glhanoi \
glknots \
glmatrix \
glplanet \
glschool \
glslideshow \
glsnake \
gltext \
goop \
......@@ -131,6 +140,7 @@ export ANDROID_HACKS= \
interaggregate \
interference \
intermomentary \
jigglypuff \
jigsaw \
julia \
kaleidescope \
......@@ -172,6 +182,7 @@ export ANDROID_HACKS= \
pulsar \
pyro \
quasicrystal \
queens \
raverhoop \
razzledazzle \
rd-bomb \
......@@ -192,6 +203,7 @@ export ANDROID_HACKS= \
spheremonics \
splitflap \
splodesic \
spotlight \
squiral \
stairs \
stonerview \
......@@ -201,6 +213,7 @@ export ANDROID_HACKS= \
surfaces \
swirl \
tangram \
tessellimage \
thornbird \
timetunnel \
topblock \
......@@ -210,17 +223,21 @@ export ANDROID_HACKS= \
twang \
unknownpleasures \
vermiculate \
vfeedback \
vigilance \
voronoi \
wander \
whirlwindwarp \
winduprobot \
wormhole \
xanalogtv \
xflame \
xjack \
xlyap \
xmatrix \
xrayswarm \
xspirograph \
zoom \
# These don't work well enough to turn on by default:
......@@ -228,19 +245,10 @@ export ANDROID_HACKS= \
ANDROID_TODO= \
antinspect \
barcode \
blitspin \
bumps \
carousel \
cityflow \
endgame \
esper \
flipscreen3d \
fliptext \
fontglide \
gleidescope \
glslideshow \
halftone \
jigglypuff \
juggler3d \
molecule \
pedal \
......@@ -248,17 +256,11 @@ ANDROID_TODO= \
photopile \
polyominoes \
qix \
queens \
speedmine \
spotlight \
starfish \
starwars \
tessellimage \
testx11 \
unicrud \
xanalogtv \
xmatrix \
zoom \
# Download and resize images from jwz.org.
......@@ -367,7 +369,7 @@ $(KEYSTORE):
keytool -genkey -v -keystore $@ \
-alias xscreensaver -keyalg RSA -keysize 2048 -validity 10000
APK_DIR = xscreensaver/build/outputs/apk/
APK_DIR = xscreensaver/build/outputs/apk/release/
APK_UNSIGNED = $(APK_DIR)xscreensaver-release-unsigned.apk
APK_UNALIGNED = $(APK_DIR)xscreensaver-release-unaligned.apk
APK_SIGNED = $(APK_DIR)xscreensaver-release.apk
......
......@@ -151,58 +151,39 @@ TODO list, and known bugs:
box does not.
antinspect renders incorrectly
antmaze crashes emulator, sometimes
antspotlight crashes emulator, sometimes
apple2 text, images into pixmaps doesn't work
atlantis crashes emulator, sometimes
barcode pixmaps
blitspin images
bsod pixmaps, XCopyArea problems
bumps images
carousel images
carousel images are corrupted
cityflow shading is wrong
endgame insanely slow
engine text
esper images, text
flipflop images
flipscreen3d images
esper images don't load, no text
fliptext text
fontglide text
gflux images
glblur grayscale instead of color
gleidescope images
glslideshow images
halftone XFillArc crash
halo some extra triangles show up
jigglypuff incredibly slow
jigsaw images
juggler3d blank
maze lines are not the same thickness (aliased?)
mirrorblob images
molecule blank
mountain polygons
munch XOR
noseguy text; images flicker to black and white
pacman launches really slowly
noseguy text; images
pacman images; launches really slowly
pedal polygons
phosphor text; pixmaps
photopile images; pixmaps
photopile text; images don't display
polyhedra text
polyominoes pixmaps
qix polygons
queens blank
slip images
queens insanely slow
sonar does icmp work?
speedmine polygons
splitflap super slow
spotlight pixmaps
spotlight blank
starfish polygons
starwars text
tessellimage pixmaps
twang background should be black
unicrud pixmaps
winduprobot dome is not transparent
xanalogtv pixmaps
xflame draws only upper left corner
xmatrix super slow, glitch on first screen
zoom pixmaps
xmatrix pretty slow
......@@ -2,17 +2,23 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.android.tools.build:gradle:3.1.2'
}
// This allows versions of Gradle past 2.9 to be used with the Gradle
// Android plugin.
// https://discuss.gradle.org/t/gradle-thinks-2-10-is-less-than-2-2-when-resolving-plugins/13434/2
// System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true';
}
allprojects {
repositories {
maven { url 'https://maven.google.com' }
jcenter()
google()
}
}
task clean(type: Delete) {
delete('./build')
}
......
#Sun Jun 12 14:20:28 PDT 2016
#Sat Feb 10 21:20:31 PST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
<component name="libraryTable">
<library name="Gradle: android.arch.core:common:1.1.0@jar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.0/8007981f7d7540d89cd18471b8e5dcd2b4f99167/common-1.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.0/f211e8f994b67f7ae2a1bc06e4f7b974ec72ee50/common-1.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: android.arch.core:runtime-1.1.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/66eddde487cc032a22af511624a2dc1d/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/66eddde487cc032a22af511624a2dc1d/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.core/runtime/1.1.0/62944187d3ae3e7a4644b50da4e7b63c605a696/runtime-1.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:common:1.1.0@jar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.0/edf3f7bfb84a7521d0599efa3b0113a0ee90f85/common-1.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.0/72f6113534923e49e8c032107ca638b97775c61b/common-1.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:livedata-core-1.1.0">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.0.aar/01d9f7cf052a887e242d3ac9bccb130e/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.0.aar/01d9f7cf052a887e242d3ac9bccb130e/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/livedata-core/1.1.0/300f89e645a95de0bdc6d8833beeee6e3045df06/livedata-core-1.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:runtime-1.1.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/625fea47a711c4db819aa2d6df929100/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/625fea47a711c4db819aa2d6df929100/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/runtime/1.1.0/a4b0d6b8e8f51c8f95d5a0641f81ffc13ab406c7/runtime-1.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:viewmodel-1.1.0">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.0.aar/0c933938d5403a08c5e3efe386ac2b02/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.0.aar/0c933938d5403a08c5e3efe386ac2b02/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/viewmodel/1.1.0/e4c0c5d65f92ccad0b0148ac2f01b540ac7a711e/viewmodel-1.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.android.support:support-annotations:27.1.1@jar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/27.1.1/39ded76b5e1ce1c5b2688e1d25cdc20ecee32007/support-annotations-27.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/27.1.1/46bebf5bd40146178cb33c7678f3782a09dea6e4/support-annotations-27.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.android.support:support-compat-27.1.1">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.1.aar/64b85698f5c1a639182eb49d0126a2d0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.1.aar/64b85698f5c1a639182eb49d0126a2d0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-compat/27.1.1/fe233277b6eae25ce5b2afab6daf55d73c86f0b9/support-compat-27.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.android.support:support-core-ui-27.1.1">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.1.aar/b432dca2f3c4bd72e4ef10511d8d2ba5/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.1.aar/b432dca2f3c4bd72e4ef10511d8d2ba5/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-core-ui/27.1.1/266c369a3227be5afec33e11c964472269ff2a7c/support-core-ui-27.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.android.support:support-core-utils-27.1.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-27.1.1.aar/0980a98a9ec854145d292239910611d4/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-27.1.1.aar/0980a98a9ec854145d292239910611d4/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-core-utils/27.1.1/8fb37fd2f8dbc23482865700d2c340ae030ea561/support-core-utils-27.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.android.support:support-fragment-27.1.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-27.1.1.aar/c39b8c3b0b8a6fd39d4cf14a5ed4d9a8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-27.1.1.aar/c39b8c3b0b8a6fd39d4cf14a5ed4d9a8/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-fragment/27.1.1/94732bda44fba11302c58e459b7c1f47e7521bf9/support-fragment-27.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.android.support:support-media-compat-27.1.1">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.1.aar/68a94910a2befb2c6cb37bd04aa2aa39/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.1.aar/68a94910a2befb2c6cb37bd04aa2aa39/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-media-compat/27.1.1/3ab3f968d7cd675d2f97e67a3e9fc0ac63618f46/support-media-compat-27.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: com.android.support:support-v4-27.1.1">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.1.aar/4063a17c1f54cf7b4dd719a35d318e61/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.1.aar/4063a17c1f54cf7b4dd719a35d318e61/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-v4/27.1.1/5b8f86fea035328fc9e8c660773037a3401ce25f/support-v4-27.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,11 +2,12 @@ apply plugin: 'android'
dependencies {
compile fileTree(include: '*.jar', dir: 'libs')
compile "com.android.support:support-v4:27.1.1"
}
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 27
buildToolsVersion "27.0.3"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
......@@ -26,7 +27,7 @@ android {
}
// Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests')
androidTest.setRoot('tests')
// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
......@@ -96,7 +97,7 @@ android {
defaultConfig {
minSdkVersion 15
targetSdkVersion 21
targetSdkVersion 27
}
productFlavors {
}
......
......@@ -69,6 +69,7 @@ LOCAL_SRC_FILES += \
hacks/glx/cow_tail.c \
hacks/glx/cow_udder.c \
hacks/glx/dolphin.c \
hacks/glx/dymaxionmap-coords.c \
hacks/glx/gllist.c \
hacks/glx/glschool_alg.c \
hacks/glx/glschool_gl.c \
......
......@@ -2,5 +2,6 @@
APP_ABI := $(shell echo $$APP_ABI)
APP_STL := stlport_static
APP_PLATFORM := android-14
# ^^ this can be increased
# ^^ APP_PLATFORM is minimum API version supported
# https://android.googlesource.com/platform/ndk/+/master/docs/user/common_problems.md#target-api-set-higher-than-device-api
......@@ -24,15 +24,25 @@ import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.provider.Settings;
import android.Manifest;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.os.Build;
import android.content.pm.PackageManager;
public class Activity extends android.app.Activity
implements View.OnClickListener {
private boolean wallpaperButtonClicked, daydreamButtonClicked;
private final static int MY_REQ_READ_EXTERNAL_STORAGE = 271828;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// openList();
setContentView(R.layout.activity_xscreensaver);
wallpaperButtonClicked = false;
daydreamButtonClicked = false;
findViewById(R.id.apply_wallpaper).setOnClickListener(this);
findViewById(R.id.apply_daydream).setOnClickListener(this);
......@@ -42,10 +52,18 @@ public class Activity extends android.app.Activity
public void onClick(View v) {
switch (v.getId()) {
case R.id.apply_wallpaper:
startActivity(new Intent(WallpaperManager.ACTION_LIVE_WALLPAPER_CHOOSER));
wallpaperButtonClicked();
break;
case R.id.apply_daydream:
daydreamButtonClicked();
break;
}
}
// synchronized when dealing with wallpaper state - perhaps can
// narrow down more
private synchronized void withProceed() {
if (daydreamButtonClicked) {
String action;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
action = Settings.ACTION_DREAM_SETTINGS;
......@@ -53,7 +71,99 @@ public class Activity extends android.app.Activity
action = Settings.ACTION_DISPLAY_SETTINGS;
}
startActivity(new Intent(action));
break;
} else if (wallpaperButtonClicked) {
startActivity(new Intent(WallpaperManager.ACTION_LIVE_WALLPAPER_CHOOSER));
}
}
private void wallpaperButtonClicked() {
wallpaperButtonClicked = true;
checkPermission();
}
private void daydreamButtonClicked() {
daydreamButtonClicked = true;
checkPermission();
}
void checkPermission() {
// RES introduced in API 16
String permission = Manifest.permission.READ_EXTERNAL_STORAGE;
if (havePermission(permission)) {
withProceed();
} else {
noPermission(permission);
}
}
private void noPermission(String permission) {
int myRequestCode;
myRequestCode = MY_REQ_READ_EXTERNAL_STORAGE;
if (permissionsDeniedRationale(permission)) {
showDeniedRationale();
} else {
requestPermission(permission, myRequestCode);
}
}
private boolean permissionsDeniedRationale(String permission) {
boolean rationale = ActivityCompat.shouldShowRequestPermissionRationale(this,
permission);
return rationale;
}
private void requestPermission(String permission, int myRequestCode) {
ActivityCompat.requestPermissions(this,
new String[]{permission},
myRequestCode);
// myRequestCode is an app-defined int constant.
// The callback method gets the result of the request.
}
// TODO: This method should be asynchronous, and not block the thread
private void showDeniedRationale() {
withProceed();
}
boolean havePermission(String permission) {
if (Build.VERSION.SDK_INT < 16) {
return true;
}
if (permissionGranted(permission)) {
return true;
}
return false;
}
private boolean permissionGranted(String permission) {
boolean check = ContextCompat.checkSelfPermission(this, permission) ==
PackageManager.PERMISSION_GRANTED;
return check;
}
public void proceedIfPermissionGranted(int[] grantResults) {
// If request is cancelled, the result arrays are empty.
if (grantResults.length > 0
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
withProceed();
} else if (grantResults.length > 0) {
withProceed();
}
}
@Override
public void onRequestPermissionsResult(int requestCode,
String permissions[], int[] grantResults) {
switch (requestCode) {
case MY_REQ_READ_EXTERNAL_STORAGE:
proceedIfPermissionGranted(grantResults);
}
}
}
......@@ -57,6 +57,11 @@ import android.media.ExifInterface;
import org.jwz.xscreensaver.TTFAnalyzer;
import android.util.Log;
import android.view.Surface;
import android.Manifest;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.os.Build;
import android.content.pm.PackageManager;
public class jwxyz
implements GestureDetector.OnGestureListener,
......@@ -100,6 +105,8 @@ public class jwxyz
public final static int FONT_FACE = 1;
public final static int FONT_RANDOM = 2;
public final static int MY_REQ_READ_EXTERNAL_STORAGE = 271828;
private long nativeRunningHackPtr;
private String hack;
......@@ -627,6 +634,38 @@ public class jwxyz
}
boolean havePermission(String permission) {
if (Build.VERSION.SDK_INT < 16) {
return true;
}
if (permissionGranted(permission)) {
return true;
}
return false;
}
private boolean permissionGranted(String permission) {
boolean check = ContextCompat.checkSelfPermission(app, permission) ==
PackageManager.PERMISSION_GRANTED;
return check;
}
public Object[] checkThenLoadRandomImage (int target_width, int target_height,
boolean rotate_p) {
// RES introduced in API 16
String permission = Manifest.permission.READ_EXTERNAL_STORAGE;
if (havePermission(permission)) {
return loadRandomImage(target_width,target_height,rotate_p);
} else {
return null;
}
}
public Object[] loadRandomImage (int target_width, int target_height,
boolean rotate_p) {
......
......@@ -24,18 +24,21 @@
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" />
......@@ -43,6 +46,13 @@
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
......@@ -62,33 +72,30 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<sourceFolder url="file://$MODULE_DIR$/tests/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/tests/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/tests/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/tests/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
</component>
</module>
\ No newline at end of file
......@@ -16114,7 +16114,7 @@ APPDEFAULTS=$ac_x_app_defaults
ac_config_files="$ac_config_files Makefile utils/Makefile jwxyz/Makefile hacks/Makefile hacks/glx/Makefile po/Makefile.in driver/Makefile driver/xscreensaver.pam driver/xscreensaver-demo.glade2 driver/XScreenSaver.ad"
ac_config_files="$ac_config_files Makefile utils/Makefile jwxyz/Makefile hacks/Makefile hacks/images/Makefile hacks/glx/Makefile po/Makefile.in driver/Makefile driver/xscreensaver.pam driver/xscreensaver-demo.glade2 driver/XScreenSaver.ad"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -16825,6 +16825,7 @@ do
"utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
"jwxyz/Makefile") CONFIG_FILES="$CONFIG_FILES jwxyz/Makefile" ;;
"hacks/Makefile") CONFIG_FILES="$CONFIG_FILES hacks/Makefile" ;;
"hacks/images/Makefile") CONFIG_FILES="$CONFIG_FILES hacks/images/Makefile" ;;
"hacks/glx/Makefile") CONFIG_FILES="$CONFIG_FILES hacks/glx/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"driver/Makefile") CONFIG_FILES="$CONFIG_FILES driver/Makefile" ;;
......
......@@ -4142,6 +4142,7 @@ AC_OUTPUT(Makefile
utils/Makefile
jwxyz/Makefile
hacks/Makefile
hacks/images/Makefile
hacks/glx/Makefile
po/Makefile.in
driver/Makefile
......
xscreensaver (5.39-1) UNRELEASED; urgency=medium
xscreensaver (5.40-1.1) UNRELEASED; urgency=medium
[ Antoine Beaupré ]
* Non-maintainer upload
* New upstream version 5.40 (Closes: #907674)
- New hacks, `filmleader', `vfeedback' and `glitchpe'
- GLPlanet blends between day and night maps at the dusk terminator.
- DymaxionMap can display arbitrary map images, and animate sunlight
across the flattened globe.
- Tessellimage can draw either Delaunay or Voronoi tilings.
- XAnalogTV includes test cards.
* removed patches that do not apply and were fixing a bug that seems
fixed upstream (#304344):
- 30_hacks_xanalogtv.patch and
- 31_utils_images_logo-50-bad-xpm.patch
[ Tormod Volden ]
* New upstream release 5.39, changes since 5.36:
- New hacks, `vigilance', 'esper', 'razzledazzle', 'peepers',
'crumbler' and `maze3d'.
......@@ -35,7 +50,7 @@ xscreensaver (5.39-1) UNRELEASED; urgency=medium
* Update Vcs-* fields to new location at salsa.debian.org
* Switch to dpkg-source 3.0 (quilt) format
-- Tormod Volden <debian.tormod@gmail.com> Sun, 23 Jul 2017 19:15:54 +0200
-- Antoine Beaupré <anarcat@debian.org> Tue, 04 Sep 2018 18:00:47 -0400
xscreensaver (5.36-1) unstable; urgency=medium
......
#
# logo-50-bad.xpm is a stripped down (64 colors) version
# Fix for bug #304344
#
Index: xscreensaver-git/hacks/xanalogtv.c
===================================================================
--- xscreensaver-git.orig/hacks/xanalogtv.c
+++ xscreensaver-git/hacks/xanalogtv.c
@@ -42,7 +42,7 @@
#include "ximage-loader.h"
#include "analogtv.h"
-#include "images/logo-50.xpm"
+#include "images/logo-50-bad.xpm"
/* #define DEBUG 1 */
/* #define USE_TEST_PATTERNS */
@@ -172,7 +172,7 @@ update_smpte_colorbars(analogtv_input *i
if (! st->colorbars_only_p)
analogtv_draw_xpm(st->tv, input,
- logo_50_xpm, xpos - 100, ypos);
+ logo_50_bad_xpm, xpos - 100, ypos);
ypos += 58;
#
# This is a stripped down (64 colors) version of the logo
# Fix for bug #304344
#
Index: xscreensaver-5.04/utils/images/logo-50-bad.xpm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xscreensaver-5.04/utils/images/logo-50-bad.xpm 2007-12-08 17:47:04.000000000 +0100
@@ -0,0 +1,118 @@
+/* XPM */
+static char * logo_50_bad_xpm[] = {
+"50 50 65 1",
+" c None",
+". c #070800",
+"+ c #440000",
+"@ c #5A0200",
+"# c #3B1C01",
+"$ c #551113",
+"% c #303019",
+"& c #353402",
+"* c #323433",
+"= c #D10400",
+"- c #DC0003",
+"; c #474624",
+"> c #E60000",
+", c #464745",
+"' c #4F5000",
+") c #EF0000",
+"! c #C71516",
+"~ c #FF0000",
+"{ c #535452",
+"] c #C62C02",
+"^ c #B52E26",
+"/ c #8C4444",
+"( c #6A6601",
+"_ c #60615F",
+": c #FF2500",
+"< c #855D5B",
+"[ c #C84D00",
+"} c #A56000",
+"| c #C64344",
+"1 c #E83534",
+"2 c #965959",
+"3 c #6D6D6E",
+"4 c #F43E01",
+"5 c #868500",
+"6 c #EC5803",
+"7 c #7A7C79",
+"8 c #A66E6E",
+"9 c #81848A",
+"0 c #EE7200",
+"a c #8D8E8B",
+"b c #A99C00",
+"c c #D48D00",
+"d c #93929F",
+"e c #99979B",
+"f c #F08B00",
+"g c #EC7B79",
+"h c #A2A0B2",
+"i c #BB9B9B",
+"j c #A7A9A6",
+"k c #F7A400",
+"l c #C6B52F",
+"m c #ACABBD",
+"n c #ECB800",
+"o c #D5C800",
+"p c #C8B2C2",
+"q c #EAC700",
+"r c #BFC1BE",
+"s c #FBA8AB",
+"t c #BFC0D0",
+"u c #C6CADA",
+"v c #CED1CD",
+"w c #D3D3DE",
+"x c #DEDFE9",
+"y c #E1E3DF",
+"z c #F5F6F3",
+" ",
+" ~k5 ",
+" ~4q. ",
+" ~~fb. ",
+" ~:q&. ",
+" ~~f5. ",
+" ~~~0o. ",
+" ~:~~0o. ",
+" ~~~~~k(. ",
+" ~~~~~6q..~:n(. ",
+" )~:~:n(+~:fb. ",
+" ~~:~~k5@~~0o.. ",
+" ~~~~~0q+:~:n&. ",
+" ~)~~~6q#~~~0q. ",
+" ~~:~~:n'>~~:k(. ",
+" _____________^~)~~0o$~~~0o._____________ ",
+" __9mmmmmmmmhmhi~~~~:n'|~~~fb{hdddddddddd93_ ",
+" _hxxxyyyyxwxvxg)~:~6q*1)~~k(duuwuuuuttttth9_ ",
+" {3wxuttttttpgld1~~~~4q,>~~)k(jxwxxwxxxxxxxth_ ",
+" _dxwpmd9dad|1n%1~~)::n&)>:>f53dedddedeeemxwm3_ ",
+" _axwtd,3337-4n;^~~~):k())~)0o*737337373{_wwm3_ ",
+" _9wutd,zzzz::k's)))~)0l>)))-n;zzzzzzzzze_xwm3_ ",
+" _9xupd{zzzs~)f5i)):))4q-)):)0bezzzzzzzze_xwm3_ ",
+" 39xutd,zxzg):6n3>)):)>f=~>>>4n;zxzzzzzze_xwm3_ ",
+" _9xutd,yxy1))4n;g)))~>66>)>>>f5jxxxxxxyd_xum3_ ",
+" _9xwtd{yyx1))>f5i)))>)-6>)-)=4n;yyyyyyyd_xwm3_ ",
+" _9xutd{xvx>)))4n;1>)>>>4-)>->-05avvvvvve{xwm3_ ",
+" 39xwtd{vvv-)>>-6l2>>)>>>-)>>--=n;wvwvwva3xwm3_ ",
+" _9xwpd{trv1)>)>>6b!>>>->-->>>--0b_rtrrt7_xwm3_ ",
+" _9xute{rpr->)>->-40>>>>>>>---=-=c'jrrje3_xwm3_ ",
+" _dxutd{jjr1--)>>--->---->-------[l*,****_xwm3_ ",
+" _9xwtd_jmj|>)->->-->->->--------=n%*****_xwm3_ ",
+" _9xttd_jej8>>-)->-->----------===c'*****_xum3_ ",
+" _exutd{eeee>->--------------===-=c(*****3xwm3_ ",
+" _9xutd_aaaa^>-------=---=========c'*****3xum3_ ",
+" _9xutd{99998-----=---==--=-=====]l.,,,**3xwm3_ ",
+" _9xwpd_33_3_^>----=========-===]}5*,,,,*_xwm3_ ",
+" 39xuud_*,,,,,!-====-=-==-=====-[n.{{,,,*3xwm3_ ",
+" _9xttd_;,,,{{{!====-==========[b%,{{{,,*<xum3_ ",
+" _9xwtd_*,,,{{{_/=-==!=======]}(*{{<{{,,,3xwm3_ ",
+" _dxupd_,,,{{___33<^]!=]=]]!}(%_33_{{{,,*3xwm3_ ",
+" _9xwth{,,,{{{___733777933__939333{3{{{{,3xwm3_ ",
+" _9xutd_,,{{{_33_377999ae9aa993333_3{{{,,3xwm3_ ",
+" _9xuphd99999999999997a99a9979999999d9999exwm3_ ",
+" 3axuttppptptttwutwwuwtwwwwwwwwxwwwwwwpwwxxwm3_ ",
+" _9xwttttututwtutwtuwuwwwwwwwwwxwwxwxxwxwxxwm3_ ",
+" _3xwtttttttttwuwwtwwwwuwwwwwwwwwxxwxwuuwxxuh3 ",
+" 3mxxxwxxxxxwwwwwwxuwwwwwuwwwwwwwpwuuwwuutm9_ ",
+" _3dptttttttttmttmmmmmtmmpmmphhhhmhphhhhhd9{_ ",
+" {_______{____{___________{___3___{____{{_ "};
......@@ -7,8 +7,9 @@
23_hacks_glx_glsnake.patch
# These two go together
30_hacks_xanalogtv.patch
31_utils_images_logo-50-bad-xpm.patch
# ... but don't apply to 5.40 so: skipped.
#30_hacks_xanalogtv.patch
#31_utils_images_logo-50-bad-xpm.patch
# All these modify XScreenSaver.ad.in
50_debian_branding.patch
......
......@@ -157,7 +157,7 @@ SAVER_UTIL_SRCS = $(UTILS_SRC)/fade.c $(UTILS_SRC)/overlay.c \
$(DEMO_UTIL_SRCS)
SAVER_UTIL_OBJS = $(UTILS_BIN)/fade.o $(UTILS_BIN)/overlay.o \
$(UTILS_BIN)/logo.o $(UTILS_BIN)/yarandom.o \
$(UTILS_BIN)/minixpm.o $(UTILS_SRC)/font-retry.o \
$(UTILS_BIN)/minixpm.o $(UTILS_BIN)/font-retry.o \
$(DEMO_UTIL_OBJS)
GETIMG_SRCS_1 = xscreensaver-getimage.c
......
......@@ -4,8 +4,8 @@
! a screen saver and locker for the X window system
! by Jamie Zawinski
!
! version 5.39
! 12-Apr-2018
! version 5.40
! 12-Aug-2018
!
! See "man xscreensaver" for more info. The latest version is always
! available at https://www.jwz.org/xscreensaver/
......@@ -384,9 +384,12 @@ GetViewPortIsFullOfLies: False
@GL_KLUDGE@ GL: esper -root \n\
@GL_KLUDGE@ GL: vigilance -root \n\
@GL_KLUDGE@ GL: crumbler -root \n\
filmleader -root \n\
glitchpeg -root \n\
@GL_KLUDGE@ GL: maze3d -root \n\
@GL_KLUDGE@ GL: peepers -root \n\
@GL_KLUDGE@ GL: razzledazzle -root \n
@GL_KLUDGE@ GL: razzledazzle -root \n\
vfeedback -root \n
......@@ -484,6 +487,7 @@ XScreenSaver.bourneShell: /bin/sh
*hacks.energystream.name: EnergyStream
*hacks.euler2d.name: Euler2D
*hacks.fadeplot.name: FadePlot
*hacks.filmleader.name: FilmLeader
*hacks.flipflop.name: FlipFlop
*hacks.flipscreen3d.name: FlipScreen3D
*hacks.fliptext.name: FlipText
......@@ -495,6 +499,7 @@ XScreenSaver.bourneShell: /bin/sh
*hacks.gflux.name: GFlux
*hacks.gleidescope.name: Gleidescope
*hacks.glforestfire.name: GLForestFire
*hacks.glitchpeg.name: GlitchPEG
*hacks.hyperball.name: HyperBall
*hacks.hypercube.name: HyperCube
*hacks.ifs.name: IFS
......@@ -537,6 +542,7 @@ XScreenSaver.bourneShell: /bin/sh
*hacks.topblock.name: TopBlock
*hacks.tronbit.name: TronBit
*hacks.unknownpleasures.name:UnknownPleasures
*hacks.vfeedback.name: VFeedback
*hacks.vidwhacker.name: VidWhacker
*hacks.webcollage.name: WebCollage
*hacks.whirlwindwarp.name: WhirlWindWarp
......
......@@ -279,9 +279,12 @@
GL: esper -root \\n\
GL: vigilance -root \\n\
GL: crumbler -root \\n\
filmleader -root \\n\
glitchpeg -root \\n\
GL: maze3d -root \\n\
GL: peepers -root \\n\
GL: razzledazzle -root \\n",
GL: razzledazzle -root \\n\
vfeedback -root \\n",
"XScreenSaver.pointerPollTime: 0:00:05",
"XScreenSaver.pointerHysteresis: 10",
"XScreenSaver.initialDelay: 0:00:00",
......@@ -348,6 +351,7 @@
"*hacks.energystream.name: EnergyStream",
"*hacks.euler2d.name: Euler2D",
"*hacks.fadeplot.name: FadePlot",
"*hacks.filmleader.name: FilmLeader",
"*hacks.flipflop.name: FlipFlop",
"*hacks.flipscreen3d.name: FlipScreen3D",
"*hacks.fliptext.name: FlipText",
......@@ -359,6 +363,7 @@
"*hacks.gflux.name: GFlux",
"*hacks.gleidescope.name: Gleidescope",
"*hacks.glforestfire.name: GLForestFire",
"*hacks.glitchpeg.name: GlitchPEG",
"*hacks.hyperball.name: HyperBall",
"*hacks.hypercube.name: HyperCube",
"*hacks.ifs.name: IFS",
......@@ -401,6 +406,7 @@
"*hacks.topblock.name: TopBlock",
"*hacks.tronbit.name: TronBit",
"*hacks.unknownpleasures.name:UnknownPleasures",
"*hacks.vfeedback.name: VFeedback",
"*hacks.vidwhacker.name: VidWhacker",
"*hacks.webcollage.name: WebCollage",
"*hacks.whirlwindwarp.name: WhirlWindWarp",<