Skip to content

xscreensaver 6.13, with changes broken down - #27

Open
hseg wants to merge 25 commits into
Zygo:masterfrom
hseg:xscreensaver-6.13-split-up
Open

xscreensaver 6.13, with changes broken down#27
hseg wants to merge 25 commits into
Zygo:masterfrom
hseg:xscreensaver-6.13-split-up

Conversation

@hseg

@hseg hseg commented Dec 3, 2025

Copy link
Copy Markdown

Went through the changes and tried to split them into logical commits for a clearer overview. Mostly succeeded, but there's two commits which I don't quite understand, marked them as such by prefixing the commit title with ?.

This revealed the upstream changelog omits/skips on detail on the following changes:

  • Makefile: install_prefix has been renamed to DESTDIR
  • The following configure options are deprecated: --with-gles, --with-glx, --without-setuid-hacks
  • make install-pam now patches the packaged xscreensaver.pam using files in the build machine's PAM configuration

Some of the more notable commits:

  • make: rename install_prefix -> DESTDIR

  • make: delete old PREFERRED_DEMO in all cases

    Although, this should just be done by pulling the rm out of the conditional

  • make: warn/error on deprecated/disliked configs

    • Error:

      • --with-gles
      • --with-glx breaks GLSL
    • Warn:

      • --without-setuid-hacks breaks hacks/sonar (jwz: for no good reason)
  • make: Fix PAM patching logic
    Pick up patches from build system's PAM_DIR, instead of package chroot's PAM_DIR (which will generally be empty)

    Of course, advisedness of such build system dependence is left as an exercise to the reader

  • app-defaults: use xdg commands (more generic)

  • Add unitary debian package

    jwz dislikes debian fragmenting the package

  • hacks/xscreensaver-getimage: store url/title in xattrs

    xattr support detection added to Makefile

  • ? Fix Wayland support

    Ran out of time trying to figure this one out, pushed all Wayland-touching code into this commit

  • utils: Extract double_time, easing to libs

  • xscreensaver: fix block until input logic

    Looks like a typo inverted the tv.tv_usec == 0 test? Don't know this code

  • ? hacks/glx/endgame: make animations fancier, add more famous endgames

    At least, I think this is what this rewrite is trying to accomplish?

  • hacks/bsod: simplify logic

  • hacks/glx/glslideshow: Rewrite

    Probably this is one of the

    Some hacks were calling glXSwapBuffers before the first call to glXMakeCurrent; allow it.

    cases mentioned in the upstream changelog, but couldn't quite figure it out.

    Removes the credit for the 2003 rewrite from Mike Oliphant for no clear reason.

  • hacks/glx/texfont: Fix on iOS
    iOS lacks support for some OpenGL APIs, skip them

  • trans: Add Georgian translation

hseg added 25 commits December 3, 2025 18:32
Although, this should just be done by pulling the rm out of the
conditional
Error:
--with-gles
--with-glx              breaks GLSL
Warn:
--without-setuid-hacks  breaks hacks/sonar (jwz: for no good reason)
Pick up patches from build system's PAM_DIR, instead of package chroot's
PAM_DIR (which will generally be empty)

Of course, advisedness of such build system dependence is left as an
exercise to the reader
jwz dislikes debian fragmenting the package
Ran out of time trying to figure this one out, pushed all
Wayland-touching code into this commit
Looks like a typo inverted the tv.tv_usec == 0 test?
At least, I *think* this is what this rewrite is trying to accomplish?
Probably this is one of the
> Some hacks were calling glXSwapBuffers before the first call to
> glXMakeCurrent; allow it.
cases mentioned in the upstream changelog, but couldn't quite figure it
out.

Removes the credit for the 2003 rewrite from Mike Oliphant for no clear
reason.
iOS lacks support for some OpenGL APIs, skip them
- Misnamed manpages
- Forgetting to write hypens as \- in manpages
and a couple more
@hseg

hseg commented Dec 3, 2025

Copy link
Copy Markdown
Author

After opening this, I see you've already committed the 6.13 lumped edit, am still leaving this PR here in case it's useful for folks.

@hseg hseg changed the title /dev/fd/62 xscreensaver 6.13, with changes broken down Dec 3, 2025
@Zygo

Zygo commented Dec 6, 2025

Copy link
Copy Markdown
Owner

It would be an interesting project idea to go through the xscreensaver history and retroactively break down releases into logical change sets. I'd follow and possibly mirror that work if someone else is willing to do it. On the other hand, anyone can open a github repo, so I'm not sure what value I can add to that.

@hseg

hseg commented Dec 6, 2025 via email

Copy link
Copy Markdown
Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants