{xine-lib,xine-ui}: reformat and update (#340813)

pkgs/applications/video/xine/ui.nix

@@ -1,78 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, autoreconfHook
-, curl
-, libXext
-, libXft
-, libXi
-, libXinerama
-, libXtst
-, libXv
-, libXxf86vm
-, libjpeg
-, libpng
-, lirc
-, ncurses
-, pkg-config
-, readline
-, shared-mime-info
-, xine-lib
-, xorgproto
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xine-ui";
-  version = "0.99.14";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/xine/xine-ui-${finalAttrs.version}.tar.xz";
-    hash = "sha256-1NSQ1c7OcOK7mEnJ5ILyz4evAwLUUbYUR2/cw2Qs2cM=";
-  };
-
-  outputs = [ "out" "dev" "lib" "man" ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    shared-mime-info
-  ];
-
-  buildInputs = [
-    curl
-    libXext
-    libXft
-    libXi
-    libXinerama
-    libXtst
-    libXv
-    libXxf86vm
-    libjpeg
-    libpng
-    lirc
-    ncurses
-    readline
-    xine-lib
-    xorgproto
-  ];
-
-  configureFlags = [ "--with-readline=${readline.dev}" ];
-
-  env = {
-    LIRC_CFLAGS="-I${lirc}/include";
-    LIRC_LIBS="-L ${lirc}/lib -llirc_client";
-  };
-
-  postInstall = ''
-    substituteInPlace $out/share/applications/xine.desktop \
-      --replace "MimeType=;" "MimeType="
-  '';
-
-  meta = {
-    homepage = "https://xine.sourceforge.net/";
-    description = "Xlib-based frontend for Xine video player";
-    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.platforms.linux;
-  };
-})

pkgs/by-name/xi/xine-lib/package.nix

@@ -1,44 +1,50 @@
-{ lib
-, stdenv
-, fetchurl
-, aalib
-, alsa-lib
-, autoreconfHook
-, ffmpeg
-, flac
-, libGL
-, libGLU
-, libX11
-, libXext
-, libXinerama
-, libXv
-, libcaca
-, libcdio
-, libmng
-, libmpcdec
-, libpulseaudio
-, libtheora
-, libv4l
-, libvorbis
-, libxcb
-, ncurses
-, perl
-, pkg-config
-, speex
-, vcdimager
-, zlib
+{
+  lib,
+  aalib,
+  alsa-lib,
+  autoreconfHook,
+  fetchhg,
+  ffmpeg,
+  flac,
+  libGL,
+  libGLU,
+  libX11,
+  libXext,
+  libXinerama,
+  libXv,
+  libcaca,
+  libcdio,
+  libmng,
+  libmpcdec,
+  libpulseaudio,
+  libtheora,
+  libv4l,
+  libvorbis,
+  libxcb,
+  ncurses,
+  perl,
+  pkg-config,
+  speex,
+  stdenv,
+  vcdimager,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xine-lib";
-  version = "1.2.13";
+  version = "1.2.13-unstable-2024-06-29";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/xine/xine-lib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-XxDW1xikpRwX7RsysDHU+bgLBh6CdlNbK+MeWsS3Xm8=";
+  src = fetchhg {
+    url = "http://hg.code.sf.net/p/xine/xine-lib-1.2";
+    rev = "53845e2f6b1f3b69328de5c030c0ab27eb8f043d";
+    hash = "sha256-O5lIYmNC2TpoY4QbPMsDWxNOoxdw61967Q4QG9d/+Bg=";
   };
 
-  outputs = [ "out" "dev" "man" ];
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
@@ -54,8 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
     libGL
     libGLU
     libX11
+    libX11
+    libXext
     libXext
     libXinerama
+    libXinerama
+    libXv
     libXv
     libcaca
     libcdio
@@ -66,26 +76,28 @@ stdenv.mkDerivation (finalAttrs: {
     libv4l
     libvorbis
     libxcb
+    libxcb
     ncurses
     perl
     speex
     vcdimager
     zlib
-    libX11
-    libXext
-    libXinerama
-    libXv
-    libxcb
   ];
 
+  env.NIX_LDFLAGS = "-lxcb-shm";
+
   enableParallelBuilding = true;
 
-  env.NIX_LDFLAGS = "-lxcb-shm";
+  strictDeps = true;
 
   meta = {
     homepage = "https://xine.sourceforge.net/";
     description = "High-performance, portable and reusable multimedia playback engine";
-    license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
+    license = with lib.licenses; [
+      gpl2Plus
+      lgpl2Plus
+    ];
+    # No useful mainProgram
     maintainers = with lib.maintainers; [ AndersonTorres ];
     platforms = lib.platforms.linux;
   };

pkgs/by-name/xi/xine-ui/package.nix

@@ -0,0 +1,85 @@
+{
+  lib,
+  autoreconfHook,
+  curl,
+  fetchhg,
+  libXext,
+  libXft,
+  libXi,
+  libXinerama,
+  libXtst,
+  libXv,
+  libXxf86vm,
+  libjpeg,
+  libpng,
+  lirc,
+  ncurses,
+  perl,
+  pkg-config,
+  readline,
+  shared-mime-info,
+  stdenv,
+  xine-lib,
+  xorgproto,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xine-ui";
+  version = "0.99.14-unstable-2024-08-26";
+
+  src = fetchhg {
+    url = "http://hg.code.sf.net/p/xine/xine-ui";
+    rev = "2beaad6bb92e6732585f68af2e346a24e5ad53a5";
+    hash = "sha256-Y08JX9q4w6pSJRCa5mWN11BnA6mZJSO/yn3X8YyZ6E4=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+    "lib"
+    "man"
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    shared-mime-info
+    perl
+  ];
+
+  buildInputs = [
+    curl
+    libXext
+    libXft
+    libXi
+    libXinerama
+    libXtst
+    libXv
+    libXxf86vm
+    libjpeg
+    libpng
+    lirc
+    ncurses
+    readline
+    xine-lib
+    xorgproto
+  ];
+
+  configureFlags = [ "--with-readline=${readline.dev}" ];
+
+  env = {
+    LIRC_CFLAGS = "-I${lib.getInclude lirc}/include";
+    LIRC_LIBS = "-L ${lib.getLib lirc}/lib -llirc_client";
+  };
+
+  strictDeps = true;
+
+  meta = {
+    homepage = "https://xine.sourceforge.net/";
+    description = "Xlib-based frontend for Xine video player";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "xine";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/top-level/all-packages.nix

@@ -34508,9 +34508,6 @@ with pkgs;
 
   xfractint = callPackage ../applications/graphics/xfractint { };
 
-  xine-ui = callPackage ../applications/video/xine/ui.nix { };
-  xine-lib = callPackage ../applications/video/xine/lib.nix { };
-
   xlsxgrep = callPackage ../applications/search/xlsxgrep { };
 
   xmind = callPackage ../applications/misc/xmind { };