diff -Nru xscreensaver-5.37/aclocal.m4 xscreensaver-5.39/aclocal.m4 --- xscreensaver-5.37/aclocal.m4 2017-05-16 01:41:52.000000000 +0000 +++ xscreensaver-5.39/aclocal.m4 2018-04-12 18:52:30.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -111,6 +111,51 @@ AC_SUBST($1)dnl ]) +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +dnl +dnl Copied from intlmacosx.m4 in gettext, GPL. +dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +glib_DEFUN([glib_gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in Mac OS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + # GLIB_WITH_NLS #----------------- glib_DEFUN([GLIB_WITH_NLS], @@ -124,6 +169,8 @@ XGETTEXT=: INTLLIBS= + glib_gt_INTL_MACOSX + AC_CHECK_HEADER(libintl.h, [gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -207,7 +254,7 @@ fi if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" + INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" fi if test "$gt_cv_have_gettext" = "yes"; then @@ -651,7 +698,7 @@ AC_SUBST([USE_NLS]) ]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru xscreensaver-5.37/android/android.iml xscreensaver-5.39/android/android.iml --- xscreensaver-5.37/android/android.iml 1970-01-01 00:00:00.000000000 +0000 +++ xscreensaver-5.39/android/android.iml 2017-10-17 19:24:25.000000000 +0000 @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru xscreensaver-5.37/android/build.gradle xscreensaver-5.39/android/build.gradle --- xscreensaver-5.37/android/build.gradle 1970-01-01 00:00:00.000000000 +0000 +++ xscreensaver-5.39/android/build.gradle 2017-07-07 23:21:39.000000000 +0000 @@ -0,0 +1,24 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.0' + } + + // 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'; +} + +task clean(type: Delete) { + delete('./build') +} + +task distClean(type: Delete) { + delete('./.gradle') +} + +distClean.dependsOn clean Binary files /tmp/tmpNO3Gvk/cQoOr_cNZ0/xscreensaver-5.37/android/gradle/wrapper/gradle-wrapper.jar and /tmp/tmpNO3Gvk/ApgopsBLeN/xscreensaver-5.39/android/gradle/wrapper/gradle-wrapper.jar differ diff -Nru xscreensaver-5.37/android/gradle/wrapper/gradle-wrapper.properties xscreensaver-5.39/android/gradle/wrapper/gradle-wrapper.properties --- xscreensaver-5.37/android/gradle/wrapper/gradle-wrapper.properties 1970-01-01 00:00:00.000000000 +0000 +++ xscreensaver-5.39/android/gradle/wrapper/gradle-wrapper.properties 2017-07-07 23:21:39.000000000 +0000 @@ -0,0 +1,6 @@ +#Sun Jun 12 14:20:28 PDT 2016 +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 diff -Nru xscreensaver-5.37/android/gradlew xscreensaver-5.39/android/gradlew --- xscreensaver-5.37/android/gradlew 1970-01-01 00:00:00.000000000 +0000 +++ xscreensaver-5.39/android/gradlew 2017-07-07 23:21:39.000000000 +0000 @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff -Nru xscreensaver-5.37/android/gradlew.bat xscreensaver-5.39/android/gradlew.bat --- xscreensaver-5.37/android/gradlew.bat 1970-01-01 00:00:00.000000000 +0000 +++ xscreensaver-5.39/android/gradlew.bat 2017-07-07 23:21:39.000000000 +0000 @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff -Nru xscreensaver-5.37/android/local.properties xscreensaver-5.39/android/local.properties --- xscreensaver-5.37/android/local.properties 1970-01-01 00:00:00.000000000 +0000 +++ xscreensaver-5.39/android/local.properties 2017-07-07 23:21:39.000000000 +0000 @@ -0,0 +1,11 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +# location of the SDK. This is only used by Ant +# For customization when using a Version Control System, please read the +# header note. +sdk.dir=/Users/jwz/Library/Android/sdk +ndk.dir=/Users/jwz/Library/Android/sdk/ndk diff -Nru xscreensaver-5.37/android/Makefile xscreensaver-5.39/android/Makefile --- xscreensaver-5.37/android/Makefile 2017-06-29 20:27:00.000000000 +0000 +++ xscreensaver-5.39/android/Makefile 2018-04-11 01:19:35.000000000 +0000 @@ -1,7 +1,7 @@ # XScreenSaver for Android export TERM=dumb -GRADLE = cd project ; ./gradlew +GRADLE = ./gradlew default:: debug all:: release @@ -40,13 +40,18 @@ abstractile \ anemone \ anemotaxis \ + antmaze \ + antspotlight \ apollonian \ + atlantis \ attraction \ atunnel \ + binaryring \ blaster \ blinkbox \ blocktube \ boing \ + bouboule \ bouncingcow \ boxed \ boxfit \ @@ -54,25 +59,34 @@ bsod \ cage \ ccurve \ + celtic \ + circuit \ cloudlife \ companioncube \ compass \ coral \ + crackberg \ + crumbler \ crystal \ + cube21 \ + cubenetic \ cubestack \ cubestorm \ cubetwist \ + cubicgrid \ cwaves \ cynosure \ dangerball \ decayscreen \ deco \ + deluxe \ demon \ - discrete \ discoball \ + discrete \ distort \ dnalogo \ drift \ + dymaxionmap \ energystream \ engine \ epicycle \ @@ -91,25 +105,33 @@ gears \ geodesic \ geodesicgears \ + gflux \ + glblur \ glcells \ + glhanoi \ glknots \ glmatrix \ + glplanet \ glschool \ glsnake \ gltext \ goop \ grav \ greynetic \ + halo \ helix \ hexadrop \ hexstrut \ hilbert \ hopalong \ + hypertorus \ hypnowheel \ ifs \ imsmap \ + interaggregate \ interference \ intermomentary \ + jigsaw \ julia \ kaleidescope \ kaleidocycle \ @@ -120,26 +142,38 @@ loop \ m6502 \ maze \ + maze3d \ memscroller \ menger \ metaballs \ + mirrorblob \ + moebius \ moebiusgears \ moire \ + moire2 \ morph3d \ + mountain \ + munch \ nerverot \ noof \ + noseguy \ + peepers \ penetrate \ penrose \ petri \ piecewise \ pinion \ + pipes \ polytopes \ pong \ popsquares \ + projectiveplane \ providence \ + pulsar \ pyro \ quasicrystal \ raverhoop \ + razzledazzle \ rd-bomb \ ripples \ rocks \ @@ -152,15 +186,19 @@ shadebobs \ sierpinski \ sierpinski3d \ + skytentacles \ slidescreen \ + slip \ + spheremonics \ + splitflap \ splodesic \ squiral \ stairs \ - starfish \ stonerview \ strange \ substrate \ superquadrics \ + surfaces \ swirl \ tangram \ thornbird \ @@ -168,6 +206,7 @@ topblock \ triangle \ tronbit \ + truchet \ twang \ unknownpleasures \ vermiculate \ @@ -178,7 +217,9 @@ winduprobot \ wormhole \ xflame \ + xjack \ xlyap \ + xrayswarm \ xspirograph \ @@ -186,73 +227,37 @@ # ANDROID_TODO= \ antinspect \ - antmaze \ - antspotlight \ - atlantis \ barcode \ - binaryring \ blitspin \ - bouboule \ bumps \ carousel \ - celtic \ - circuit \ cityflow \ - crackberg \ - cube21 \ - cubenetic \ - cubicgrid \ - deluxe \ - dymaxionmap \ endgame \ + esper \ flipscreen3d \ fliptext \ fontglide \ - gflux \ - glblur \ gleidescope \ - glhanoi \ - glplanet \ glslideshow \ halftone \ - halo \ - hypertorus \ - interaggregate \ jigglypuff \ - jigsaw \ juggler3d \ - mirrorblob \ - moebius \ - moire2 \ molecule \ - mountain \ - munch \ - noseguy \ pedal \ phosphor \ photopile \ - pipes \ polyominoes \ - projectiveplane \ - pulsar \ qix \ queens \ - skytentacles \ - slip \ speedmine \ - spheremonics \ - splitflap \ spotlight \ + starfish \ starwars \ - surfaces \ tessellimage \ testx11 \ - truchet \ unicrud \ xanalogtv \ - xjack \ xmatrix \ - xrayswarm \ zoom \ @@ -285,7 +290,7 @@ fi; \ done -project/xscreensaver/res/drawable/%.png: +xscreensaver/res/drawable/%.png: @\ FILE1=`echo "$@" | sed 's!^.*/\([^/]*\)\.png$$!\1.jpg!'` ; \ FILE2="$@" ; \ @@ -303,24 +308,25 @@ thumbs:: @for f in $(ANDROID_HACKS) $(ANDROID_TODO) ; do \ - $(MAKE) project/xscreensaver/res/drawable/$$f.png ; \ + $(MAKE) xscreensaver/res/drawable/$$f.png ; \ done clean_thumbs:: @\ for f in $(ANDROID_HACKS) $(ANDROID_TODO) ; do \ - rm -f project/xscreensaver/res/drawable/$$f.png ; \ + rm -f xscreensaver/res/drawable/$$f.png ; \ done distclean:: clean_thumbs clean -EXTRA_TARFILES = project/xscreensaver/res/drawable/thumbnail.png \ +EXTRA_TARFILES = xscreensaver/res/drawable/thumbnail.png \ echo_tarfiles: @FILES=`find . $(EXTRA_TARFILES) \( \( \ -name .DS_Store \ -o -name '*~' \ + -o -name '*.jks' \ -o -name '*.keystore' \ -o -name '*_dream.xml' \ -o -name '*_settings.xml' \ @@ -343,27 +349,30 @@ | sort` ; \ echo $$FILES +images_png_h: + cd ../hacks/images && $(MAKE) + run_check:: ../hacks/check-configs.pl --build-android $(ANDROID_HACKS) -debug:: m6502.h run_check +debug:: m6502.h run_check images_png_h $(GRADLE) assembleDebug -release:: m6502.h run_check +release:: m6502.h run_check images_png_h export APP_ABI=all ; \ $(GRADLE) assembleRelease -KEYSTORE = xscreensaver.keystore +KEYSTORE = xscreensaver.jks $(KEYSTORE): keytool -genkey -v -keystore $@ \ -alias xscreensaver -keyalg RSA -keysize 2048 -validity 10000 -APK_DIR = project/xscreensaver/build/outputs/apk/ -APK_UNSIGNED = $(APK_DIR)/xscreensaver-release-unsigned.apk -APK_UNALIGNED = $(APK_DIR)/xscreensaver-release-unaligned.apk -APK_SIGNED = $(APK_DIR)/xscreensaver-release.apk +APK_DIR = xscreensaver/build/outputs/apk/ +APK_UNSIGNED = $(APK_DIR)xscreensaver-release-unsigned.apk +APK_UNALIGNED = $(APK_DIR)xscreensaver-release-unaligned.apk +APK_SIGNED = $(APK_DIR)xscreensaver-release.apk - TOOLDIR = $(shell echo $$HOME/Library/Android/sdk/build-tools/* | tail -1) + TOOLDIR = $(shell ls -d $$HOME/Library/Android/sdk/build-tools/* | tail -1) ZIPALIGN = $(TOOLDIR)/zipalign JARSIGNER = jarsigner diff -Nru xscreensaver-5.37/android/project/build.gradle xscreensaver-5.39/android/project/build.gradle --- xscreensaver-5.37/android/project/build.gradle 2016-10-07 21:14:41.000000000 +0000 +++ xscreensaver-5.39/android/project/build.gradle 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' - } - - // 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'; -} - -task clean(type: Delete) { - delete('./build') -} - -task distClean(type: Delete) { - delete('./.gradle') -} - -distClean.dependsOn clean Binary files /tmp/tmpNO3Gvk/cQoOr_cNZ0/xscreensaver-5.37/android/project/gradle/wrapper/gradle-wrapper.jar and /tmp/tmpNO3Gvk/ApgopsBLeN/xscreensaver-5.39/android/project/gradle/wrapper/gradle-wrapper.jar differ diff -Nru xscreensaver-5.37/android/project/gradle/wrapper/gradle-wrapper.properties xscreensaver-5.39/android/project/gradle/wrapper/gradle-wrapper.properties --- xscreensaver-5.37/android/project/gradle/wrapper/gradle-wrapper.properties 2016-10-04 07:43:31.000000000 +0000 +++ xscreensaver-5.39/android/project/gradle/wrapper/gradle-wrapper.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#Sun Jun 12 14:20:28 PDT 2016 -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 diff -Nru xscreensaver-5.37/android/project/gradlew xscreensaver-5.39/android/project/gradlew --- xscreensaver-5.37/android/project/gradlew 2016-06-12 21:20:28.000000000 +0000 +++ xscreensaver-5.39/android/project/gradlew 1970-01-01 00:00:00.000000000 +0000 @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff -Nru xscreensaver-5.37/android/project/gradlew.bat xscreensaver-5.39/android/project/gradlew.bat --- xscreensaver-5.37/android/project/gradlew.bat 2016-06-12 21:20:28.000000000 +0000 +++ xscreensaver-5.39/android/project/gradlew.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff -Nru xscreensaver-5.37/android/project/local.properties xscreensaver-5.39/android/project/local.properties --- xscreensaver-5.37/android/project/local.properties 2015-06-25 18:47:39.000000000 +0000 +++ xscreensaver-5.39/android/project/local.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. - -# location of the SDK. This is only used by Ant -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=/Users/jwz/Library/Android/sdk -ndk.dir=/Users/jwz/Library/Android/sdk/ndk diff -Nru xscreensaver-5.37/android/project/project.iml xscreensaver-5.39/android/project/project.iml --- xscreensaver-5.37/android/project/project.iml 2016-10-03 23:10:13.000000000 +0000 +++ xscreensaver-5.39/android/project/project.iml 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff -Nru xscreensaver-5.37/android/project/settings.gradle xscreensaver-5.39/android/project/settings.gradle --- xscreensaver-5.37/android/project/settings.gradle 2016-05-16 08:54:10.000000000 +0000 +++ xscreensaver-5.39/android/project/settings.gradle 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -include ':xscreensaver' Binary files /tmp/tmpNO3Gvk/cQoOr_cNZ0/xscreensaver-5.37/android/project/xscreensaver/assets/fonts/OCRAStd.otf and /tmp/tmpNO3Gvk/ApgopsBLeN/xscreensaver-5.39/android/project/xscreensaver/assets/fonts/OCRAStd.otf differ Binary files /tmp/tmpNO3Gvk/cQoOr_cNZ0/xscreensaver-5.37/android/project/xscreensaver/assets/fonts/PxPlus_IBM_VGA8.ttf and /tmp/tmpNO3Gvk/ApgopsBLeN/xscreensaver-5.39/android/project/xscreensaver/assets/fonts/PxPlus_IBM_VGA8.ttf differ Binary files /tmp/tmpNO3Gvk/cQoOr_cNZ0/xscreensaver-5.37/android/project/xscreensaver/assets/fonts/YearlReg.ttf and /tmp/tmpNO3Gvk/ApgopsBLeN/xscreensaver-5.39/android/project/xscreensaver/assets/fonts/YearlReg.ttf differ diff -Nru xscreensaver-5.37/android/project/xscreensaver/build.gradle xscreensaver-5.39/android/project/xscreensaver/build.gradle --- xscreensaver-5.37/android/project/xscreensaver/build.gradle 2016-06-12 20:31:32.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/build.gradle 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -apply plugin: 'android' - -dependencies { - compile fileTree(include: '*.jar', dir: 'libs') -} - -android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - // jniLibs.srcDirs = ['jni'] - jniLibs.srcDirs = ['libs'] - jni.srcDirs = [] // disable automatic ndk-build call - } - - // Move the tests to tests/java, tests/res, etc... - instrumentTest.setRoot('tests') - - // Move the build types to build-types/ - // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... - // This moves them out of them default location under src//... which would - // conflict with src/ being used by the main source set. - // Adding new build types or product flavors should be accompanied - // by a similar customization. - debug.setRoot('build-types/debug') - release.setRoot('build-types/release') - } - project.ext.versionCodes = ['armeabi': 1, 'armeabi-v7a': 2, 'arm64-v8a': 3, 'mips': 5, 'mips64': 6, 'x86': 8, 'x86_64': 9] - //versionCode digit for each supported ABI, with 64bit>32bit and x86>armeabi-* - - - // put ndk-build in build's path, or replace below with its full path - task ndkBuild(type: Exec) { - Properties properties = new Properties() - properties.load(project.rootProject.file('local.properties').newDataInputStream()) - def ndkDir = properties.getProperty('ndk.dir') - commandLine "$ndkDir/ndk-build", '-C', file('jni').absolutePath, - '-j' + Runtime.getRuntime().availableProcessors().toString() - } - - // generate files early in the process - task perlBuild(type: Exec) { - commandLine 'sh', '-c', - 'cd ../..; ../hacks/check-configs.pl --build-android $ANDROID_HACKS' - } - - task perlClean(type: Delete) { - delete('../../gen') - delete('res/values') - delete('res/xml') - delete('src/org/jwz/xscreensaver/gen') - delete('AndroidManifest.xml') - } - - task objlibClean(type: Delete) { - delete('./build') - delete('./libs') - delete('./obj') - } - - task downloadNeededDrawables(type: Exec) { - commandLine 'sh', '-c', - 'cd ../../ ; \ - for f in $ANDROID_HACKS; do \ - f=`echo "$f" | sed s/rd-bomb/rdbomb/` ; \ - make -s project/xscreensaver/res/drawable/$f.png ; \ - done' - } - preBuild.dependsOn downloadNeededDrawables - - preBuild.dependsOn perlBuild - - task config_h(type: Exec) { - commandLine 'sh', '-c', - 'if [ ! -s ../../../config.h ]; then \ - echo "" >&2 ; echo "" >&2 ; \ - echo "config.h does not exist. cd .. and run ./configure" >&2 ; \ - echo "" >&2 ; \ - exit 1 ; \ - fi' - } - preBuild.dependsOn config_h - - clean.dependsOn perlClean - clean.dependsOn objlibClean - - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" - } - - tasks.withType(JavaCompile) { - compileTask -> compileTask.dependsOn ndkBuild - } - - - defaultConfig { - minSdkVersion 15 - targetSdkVersion 21 - } - productFlavors { - } - buildTypes { - debug { - jniDebuggable true - } - } -} diff -Nru xscreensaver-5.37/android/project/xscreensaver/build.xml xscreensaver-5.39/android/project/xscreensaver/build.xml --- xscreensaver-5.37/android/project/xscreensaver/build.xml 2014-10-27 07:25:28.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/build.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Binary files /tmp/tmpNO3Gvk/cQoOr_cNZ0/xscreensaver-5.37/android/project/xscreensaver/gradle/wrapper/gradle-wrapper.jar and /tmp/tmpNO3Gvk/ApgopsBLeN/xscreensaver-5.39/android/project/xscreensaver/gradle/wrapper/gradle-wrapper.jar differ diff -Nru xscreensaver-5.37/android/project/xscreensaver/gradle/wrapper/gradle-wrapper.properties xscreensaver-5.39/android/project/xscreensaver/gradle/wrapper/gradle-wrapper.properties --- xscreensaver-5.37/android/project/xscreensaver/gradle/wrapper/gradle-wrapper.properties 2016-10-03 22:52:01.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/gradle/wrapper/gradle-wrapper.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#Mon Dec 28 10:00:20 PST 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff -Nru xscreensaver-5.37/android/project/xscreensaver/gradlew xscreensaver-5.39/android/project/xscreensaver/gradlew --- xscreensaver-5.37/android/project/xscreensaver/gradlew 2016-06-08 01:38:12.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/gradlew 1970-01-01 00:00:00.000000000 +0000 @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff -Nru xscreensaver-5.37/android/project/xscreensaver/gradlew.bat xscreensaver-5.39/android/project/xscreensaver/gradlew.bat --- xscreensaver-5.37/android/project/xscreensaver/gradlew.bat 2016-06-08 01:38:12.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/gradlew.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff -Nru xscreensaver-5.37/android/project/xscreensaver/.idea/compiler.xml xscreensaver-5.39/android/project/xscreensaver/.idea/compiler.xml --- xscreensaver-5.37/android/project/xscreensaver/.idea/compiler.xml 2016-10-03 23:10:05.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/.idea/compiler.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff -Nru xscreensaver-5.37/android/project/xscreensaver/.idea/gradle.xml xscreensaver-5.39/android/project/xscreensaver/.idea/gradle.xml --- xscreensaver-5.37/android/project/xscreensaver/.idea/gradle.xml 2016-10-03 23:11:46.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/.idea/gradle.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff -Nru xscreensaver-5.37/android/project/xscreensaver/.idea/misc.xml xscreensaver-5.39/android/project/xscreensaver/.idea/misc.xml --- xscreensaver-5.37/android/project/xscreensaver/.idea/misc.xml 2016-10-03 23:10:13.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/.idea/misc.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff -Nru xscreensaver-5.37/android/project/xscreensaver/.idea/modules.xml xscreensaver-5.39/android/project/xscreensaver/.idea/modules.xml --- xscreensaver-5.37/android/project/xscreensaver/.idea/modules.xml 2016-10-03 23:10:13.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/.idea/modules.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff -Nru xscreensaver-5.37/android/project/xscreensaver/.idea/workspace.xml xscreensaver-5.39/android/project/xscreensaver/.idea/workspace.xml --- xscreensaver-5.37/android/project/xscreensaver/.idea/workspace.xml 2016-10-03 23:11:46.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/.idea/workspace.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,1863 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1475536195508 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff -Nru xscreensaver-5.37/android/project/xscreensaver/jni/Android.mk xscreensaver-5.39/android/project/xscreensaver/jni/Android.mk --- xscreensaver-5.37/android/project/xscreensaver/jni/Android.mk 2017-06-19 03:35:39.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/jni/Android.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,167 +0,0 @@ -LOCAL_PATH := $(call my-dir)/../../../.. - -include $(CLEAR_VARS) - -LOCAL_MODULE := xscreensaver - -# The base framework files: -LOCAL_SRC_FILES := \ - android/screenhack-android.c \ - jwxyz/jwxyz-android.c \ - jwxyz/jwxyz-common.c \ - jwxyz/jwxyz-gl.c \ - jwxyz/jwxyz-timers.c \ - jwxyz/jwzgles.c \ - -# Utilities used by the hacks: -LOCAL_SRC_FILES += \ - hacks/analogtv.c \ - hacks/delaunay.c \ - hacks/fps.c \ - hacks/glx/dropshadow.c \ - hacks/glx/chessmodels.c \ - hacks/glx/fps-gl.c \ - hacks/glx/gltrackball.c \ - hacks/glx/glut_stroke.c \ - hacks/glx/glut_swidth.c \ - hacks/glx/grab-ximage.c \ - hacks/glx/marching.c \ - hacks/glx/normals.c \ - hacks/glx/rotator.c \ - hacks/glx/sphere.c \ - hacks/glx/texfont.c \ - hacks/glx/trackball.c \ - hacks/glx/tube.c \ - hacks/glx/xpm-ximage.c \ - hacks/xlockmore.c \ - hacks/xpm-pixmap.c \ - utils/async_netdb.c \ - utils/aligned_malloc.c \ - utils/colorbars.c \ - utils/colors.c \ - utils/erase.c \ - utils/grabclient.c \ - utils/hsv.c \ - utils/logo.c \ - utils/minixpm.c \ - utils/pow2.c \ - utils/resources.c \ - utils/spline.c \ - utils/textclient-mobile.c \ - utils/thread_util.c \ - utils/usleep.c \ - utils/utf8wc.c \ - utils/xft.c \ - utils/xshm.c \ - utils/yarandom.c \ - -# The source files of all of the currently active hacks: -LOCAL_SRC_FILES += $(shell \ - for f in $$ANDROID_HACKS ; do \ - if [ "$$f" = "companioncube" ]; then f="companion"; fi ; \ - if [ -f "../../../../hacks/$$f.c" ]; then \ - echo "hacks/$$f.c" ; \ - else \ - echo "hacks/glx/$$f.c" ; \ - fi ; \ - done ) - -# Some savers occupy more than one source file: -LOCAL_SRC_FILES += \ - hacks/apple2-main.c \ - hacks/asm6502.c \ - hacks/pacman_ai.c \ - hacks/pacman_level.c \ - hacks/glx/b_draw.c \ - hacks/glx/b_lockglue.c \ - hacks/glx/b_sphere.c \ - hacks/glx/buildlwo.c \ - hacks/glx/companion_quad.c \ - hacks/glx/companion_disc.c \ - hacks/glx/companion_heart.c \ - hacks/glx/cow_face.c \ - hacks/glx/cow_hide.c \ - hacks/glx/cow_hoofs.c \ - hacks/glx/cow_horns.c \ - hacks/glx/cow_tail.c \ - hacks/glx/cow_udder.c \ - hacks/glx/dolphin.c \ - hacks/glx/gllist.c \ - hacks/glx/glschool_alg.c \ - hacks/glx/glschool_gl.c \ - hacks/glx/involute.c \ - hacks/glx/lament_model.c \ - hacks/glx/pipeobjs.c \ - hacks/glx/robot.c \ - hacks/glx/robot-wireframe.c \ - hacks/glx/polyhedra-gl.c \ - hacks/glx/s1_1.c \ - hacks/glx/s1_2.c \ - hacks/glx/s1_3.c \ - hacks/glx/s1_4.c \ - hacks/glx/s1_5.c \ - hacks/glx/s1_6.c \ - hacks/glx/s1_b.c \ - hacks/glx/seccam.c \ - hacks/glx/shark.c \ - hacks/glx/sonar-sim.c \ - hacks/glx/sonar-icmp.c \ - hacks/glx/splitflap_obj.c \ - hacks/glx/sproingiewrap.c \ - hacks/glx/stonerview-move.c \ - hacks/glx/stonerview-osc.c \ - hacks/glx/stonerview-view.c \ - hacks/glx/swim.c \ - hacks/glx/tangram_shapes.c \ - hacks/glx/teapot.c \ - hacks/glx/toast.c \ - hacks/glx/toast2.c \ - hacks/glx/toaster.c \ - hacks/glx/toaster_base.c \ - hacks/glx/toaster_handle.c \ - hacks/glx/toaster_handle2.c \ - hacks/glx/toaster_jet.c \ - hacks/glx/toaster_knob.c \ - hacks/glx/toaster_slots.c \ - hacks/glx/toaster_wing.c \ - hacks/glx/tronbit_idle1.c \ - hacks/glx/tronbit_idle2.c \ - hacks/glx/tronbit_no.c \ - hacks/glx/tronbit_yes.c \ - hacks/glx/tunnel_draw.c \ - hacks/glx/whale.c \ - -LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lEGL -latomic - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/android \ - $(LOCAL_PATH)/utils \ - $(LOCAL_PATH)/jwxyz \ - $(LOCAL_PATH)/hacks \ - $(LOCAL_PATH)/hacks/glx \ - -# -Wnested-externs would also be here, but for Android unistd.h. -LOCAL_CFLAGS += \ - -std=c99 \ - -Wall \ - -Wstrict-prototypes \ - -Wmissing-prototypes \ - -DSTANDALONE=1 \ - -DHAVE_ANDROID=1 \ - -DUSE_GL=1 \ - -DHAVE_JWXYZ=1 \ - -DJWXYZ_GL=1 \ - -DHAVE_JWZGLES=1 \ - -DHAVE_XUTF8DRAWSTRING=1 \ - -DHAVE_GLBINDTEXTURE=1 \ - -DGL_VERSION_ES_CM_1_0 \ - -DHAVE_UNISTD_H=1 \ - -DHAVE_INTTYPES_H=1 \ - -DHAVE_UNAME=1 \ - -DHAVE_UTIL_H=1 \ - -DGETTIMEOFDAY_TWO_ARGS=1 \ - -DHAVE_ICMP=1 \ - -DHAVE_PTHREAD=1 \ - -include $(BUILD_SHARED_LIBRARY) diff -Nru xscreensaver-5.37/android/project/xscreensaver/jni/Application.mk xscreensaver-5.39/android/project/xscreensaver/jni/Application.mk --- xscreensaver-5.37/android/project/xscreensaver/jni/Application.mk 2016-05-21 16:57:03.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/jni/Application.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -# Get this value from android/Makefile -APP_ABI := $(shell echo $$APP_ABI) -APP_STL := stlport_static -APP_PLATFORM := android-14 -# ^^ this can be increased - diff -Nru xscreensaver-5.37/android/project/xscreensaver/local.properties xscreensaver-5.39/android/project/xscreensaver/local.properties --- xscreensaver-5.37/android/project/xscreensaver/local.properties 2016-10-03 23:09:56.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/local.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Mon Oct 03 16:09:56 PDT 2016 -sdk.dir=/Users/jwz/Library/Android/sdk diff -Nru xscreensaver-5.37/android/project/xscreensaver/project.properties xscreensaver-5.39/android/project/xscreensaver/project.properties --- xscreensaver-5.37/android/project/xscreensaver/project.properties 2016-05-16 08:46:06.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/project.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -android.library.reference.1= -# Project target. -target=android-19 Binary files /tmp/tmpNO3Gvk/cQoOr_cNZ0/xscreensaver-5.37/android/project/xscreensaver/res/drawable/thumbnail.png and /tmp/tmpNO3Gvk/ApgopsBLeN/xscreensaver-5.39/android/project/xscreensaver/res/drawable/thumbnail.png differ Binary files /tmp/tmpNO3Gvk/cQoOr_cNZ0/xscreensaver-5.37/android/project/xscreensaver/res/drawable-ldpi/icon.png and /tmp/tmpNO3Gvk/ApgopsBLeN/xscreensaver-5.39/android/project/xscreensaver/res/drawable-ldpi/icon.png differ Binary files /tmp/tmpNO3Gvk/cQoOr_cNZ0/xscreensaver-5.37/android/project/xscreensaver/res/drawable-mdpi/icon.png and /tmp/tmpNO3Gvk/ApgopsBLeN/xscreensaver-5.39/android/project/xscreensaver/res/drawable-mdpi/icon.png differ diff -Nru xscreensaver-5.37/android/project/xscreensaver/res/layout/activity_xscreensaver.xml xscreensaver-5.39/android/project/xscreensaver/res/layout/activity_xscreensaver.xml --- xscreensaver-5.37/android/project/xscreensaver/res/layout/activity_xscreensaver.xml 2017-04-18 00:31:43.000000000 +0000 +++ xscreensaver-5.39/android/project/xscreensaver/res/layout/activity_xscreensaver.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ - - - - - - - - -