From 491d1a58ad0d5dd7b8e9d807d7e98e4ee4d30040 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 27 Mar 2025 02:34:48 +0100 Subject: [PATCH] SDL1: drop --- pkgs/by-name/sd/SDL1/find-headers.patch | 26 ---- pkgs/by-name/sd/SDL1/package.nix | 156 ------------------------ pkgs/by-name/sd/SDL1/setup-hook.sh | 16 --- pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+), 198 deletions(-) delete mode 100644 pkgs/by-name/sd/SDL1/find-headers.patch delete mode 100644 pkgs/by-name/sd/SDL1/package.nix delete mode 100644 pkgs/by-name/sd/SDL1/setup-hook.sh diff --git a/pkgs/by-name/sd/SDL1/find-headers.patch b/pkgs/by-name/sd/SDL1/find-headers.patch deleted file mode 100644 index fd498117fd64..000000000000 --- a/pkgs/by-name/sd/SDL1/find-headers.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/sdl-config.in b/sdl-config.in -index e0fcc0c..bf7928a 100644 ---- a/sdl-config.in -+++ b/sdl-config.in -@@ -42,14 +42,18 @@ while test $# -gt 0; do - echo @SDL_VERSION@ - ;; - --cflags) -- echo -I@includedir@/SDL @SDL_CFLAGS@ -+ SDL_CFLAGS="" -+ for i in @includedir@/SDL $SDL_PATH; do -+ SDL_CFLAGS="$SDL_CFLAGS -I$i" -+ done -+ echo $SDL_CFLAGS @SDL_CFLAGS@ - ;; - @ENABLE_SHARED_TRUE@ --libs) --@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ -+@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ $SDL_LIB_PATH - @ENABLE_SHARED_TRUE@ ;; - @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) - @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) --@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ -+@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ $SDL_LIB_PATH - @ENABLE_STATIC_TRUE@ ;; - *) - echo "${usage}" 1>&2 diff --git a/pkgs/by-name/sd/SDL1/package.nix b/pkgs/by-name/sd/SDL1/package.nix deleted file mode 100644 index bd793b5885bb..000000000000 --- a/pkgs/by-name/sd/SDL1/package.nix +++ /dev/null @@ -1,156 +0,0 @@ -{ lib -, alsa-lib -, audiofile -, config -, darwin -, fetchpatch -, fetchurl -, libGL -, libGLU -, libICE -, libXext -, libXrandr -, libcap -, libiconv -, libpulseaudio -, pkg-config -, stdenv -# Boolean flags -, alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid -, libGLSupported ? lib.meta.availableOn stdenv.hostPlatform libGL -, openglSupport ? libGLSupported -, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio -, x11Support ? !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isAndroid -}: - -# NOTE: When editing this expression see if the same change applies to -# SDL2 expression too - -let - inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; - extraPropagatedBuildInputs = [ ] - ++ lib.optionals x11Support [ libXext libICE libXrandr ] - ++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux) [ libGL ] - # libGLU doesn’t work with Android's SDL - ++ lib.optionals (openglSupport && stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAndroid)) [ libGLU ] - ++ lib.optionals (openglSupport && stdenv.hostPlatform.isDarwin) [ OpenGL GLUT ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; -in -stdenv.mkDerivation (finalAttrs: { - pname = "SDL"; - version = "1.2.15"; - - src = fetchurl { - url = "https://www.libsdl.org/release/SDL-${finalAttrs.version}.tar.gz"; - hash = "sha256-1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA="; - }; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; # sdl-config - - nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.hostPlatform.isLinux libcap; - - propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; - - buildInputs = - [ ] - ++ lib.optionals (!stdenv.hostPlatform.isMinGW && alsaSupport) [ audiofile ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; - - configureFlags = [ - "--disable-oss" - "--disable-video-x11-xme" - "--enable-rpath" - # Building without this fails on Darwin with - # - # ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32' - # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) - # - # Please try revert the change that introduced this comment when updating SDL. - ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-x11-shared" - ++ lib.optional (!x11Support) "--without-x" - ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" - ++ lib.optional stdenv.hostPlatform.isMusl "CFLAGS=-DICONV_INBUF_NONCONST"; - - patches = [ - ./find-headers.patch - - # Fix window resizing issues, e.g. for xmonad - # Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430 - (fetchpatch { - name = "fix_window_resizing.diff"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=fix_window_resizing.diff;att=2;bug=665779"; - hash = "sha256-hj3ykyOKeDh6uPDlvwNHSowQxmR+mfhvCnHvcdhXZfw="; - }) - # Fix drops of keyboard events for SDL_EnableUNICODE - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/0332e2bb18dc68d6892c3b653b2547afe323854b.patch"; - hash = "sha256-5V6K0oTN56RRi48XLPQsjgLzt0a6GsjajDrda3ZEhTw="; - }) - # Ignore insane joystick axis events - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/ab99cc82b0a898ad528d46fa128b649a220a94f4.patch"; - hash = "sha256-8CvKHvkmidm4tFCWYhxE059hN3gwOKz6nKs5rvQ4ZKw="; - }) - # https://bugzilla.libsdl.org/show_bug.cgi?id=1769 - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/5d79977ec7a6b58afa6e4817035aaaba186f7e9f.patch"; - hash = "sha256-t+60bC4gLFbslXm1n9nimiFrho2DnxdWdKr4H9Yp/sw="; - }) - # Workaround X11 bug to allow changing gamma - # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222 - (fetchpatch { - name = "SDL_SetGamma.patch"; - url = "https://src.fedoraproject.org/rpms/SDL/raw/7a07323e5cec08bea6f390526f86a1ce5341596d/f/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch"; - hash = "sha256-m7ZQ5GnfGlMkKJkrBSB3GrLz8MT6njgI9jROJAbRonQ="; - }) - # Fix a build failure on OS X Mavericks - # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/19039324be71738d8990e91b9ba341b2ea068445.patch"; - hash = "sha256-DCWZo0LzHJoWUr/5vL5pKIEmmz3pvr4TO6Ip8WykfDI="; - }) - (fetchpatch { - url = "https://github.com/libsdl-org/SDL-1.2/commit/7933032ad4d57c24f2230db29f67eb7d21bb5654.patch"; - hash = "sha256-Knq+ceL6y/zKcfJayC2gy+DKnoa8DLslBNl3laMzwa8="; - }) - (fetchpatch { - name = "CVE-2022-34568.patch"; - url = "https://github.com/libsdl-org/SDL-1.2/commit/d7e00208738a0bc6af302723fe64908ac35b777b.patch"; - hash = "sha256-fuxXsqZW94/C8CKu9LakppCU4zHupj66O2MngQ4BO9o="; - }) - ]; - - enableParallelBuilding = true; - - postInstall = '' - moveToOutput share/aclocal "$dev" - ''; - - # See the same place in the expression for SDL2 - postFixup = let - rpath = lib.makeLibraryPath extraPropagatedBuildInputs; - in '' - for lib in $out/lib/*.so* ; do - if [[ -L "$lib" ]]; then - patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib" - fi - done - ''; - - setupHook = ./setup-hook.sh; - - passthru = { inherit openglSupport; }; - - meta = { - homepage = "http://www.libsdl.org/"; - description = "Cross-platform multimedia library"; - license = lib.licenses.lgpl21; - mainProgram = "sdl-config"; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ lovek323 ]); - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/by-name/sd/SDL1/setup-hook.sh b/pkgs/by-name/sd/SDL1/setup-hook.sh deleted file mode 100644 index 54a9b3e8bfab..000000000000 --- a/pkgs/by-name/sd/SDL1/setup-hook.sh +++ /dev/null @@ -1,16 +0,0 @@ -addSDLPath () { - if [ -e "$1/include/SDL" ]; then - export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL" - # NB this doesn’t work with split dev packages because different packages - # will contain "include/SDL/" and "lib/" directories. - # - # However the SDL_LIB_PATH is consumed by SDL itself and serves to locate - # libraries like SDL_mixer, SDL_image, etc which are not split-package - # so the check above will only trigger on them. - if [ -e "$1/lib" ]; then - export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib" - fi - fi -} - -addEnvHooks "$hostOffset" addSDLPath diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4062e9fe039e..6ad6b4c2132f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1393,6 +1393,7 @@ mapAliases { ### S ### SDL_classic = SDL1; # Added 2024-09-03 + SDL1 = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27 SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15 s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17 sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06