From af2f74585f9fb5b517aea0592491809b1cb36a01 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 9 Sep 2024 08:58:51 -0300 Subject: [PATCH 1/7] {xine-lib,xine-ui}: migrate to by-name --- .../video/xine/lib.nix => by-name/xi/xine-lib/package.nix} | 0 .../video/xine/ui.nix => by-name/xi/xine-ui/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 3 deletions(-) rename pkgs/{applications/video/xine/lib.nix => by-name/xi/xine-lib/package.nix} (100%) rename pkgs/{applications/video/xine/ui.nix => by-name/xi/xine-ui/package.nix} (100%) diff --git a/pkgs/applications/video/xine/lib.nix b/pkgs/by-name/xi/xine-lib/package.nix similarity index 100% rename from pkgs/applications/video/xine/lib.nix rename to pkgs/by-name/xi/xine-lib/package.nix diff --git a/pkgs/applications/video/xine/ui.nix b/pkgs/by-name/xi/xine-ui/package.nix similarity index 100% rename from pkgs/applications/video/xine/ui.nix rename to pkgs/by-name/xi/xine-ui/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdc85bebc9df..d7609bba15c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34513,9 +34513,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 { }; From 6ff2266896bc12ab0d3270bdae7d19c68be34842 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 7 Sep 2024 22:18:24 +0100 Subject: [PATCH 2/7] xine-lib: 1.2.13 -> 1.2.13-unstable-2024-06-29 Includes fixes for FFmpeg 7. --- pkgs/by-name/xi/xine-lib/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix index 641243ee77c6..426d5a6c1363 100644 --- a/pkgs/by-name/xi/xine-lib/package.nix +++ b/pkgs/by-name/xi/xine-lib/package.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchhg , aalib , alsa-lib , autoreconfHook @@ -31,11 +31,12 @@ 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" ]; From 1f15da3c69db0b60c74e85e92c2d5157319a682b Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 7 Sep 2024 22:18:24 +0100 Subject: [PATCH 3/7] xine-ui: 0.99.14 -> 0.99.14-unstable-2024-08-26 --- pkgs/by-name/xi/xine-ui/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix index 84631a8c4579..d597c50e3b7f 100644 --- a/pkgs/by-name/xi/xine-ui/package.nix +++ b/pkgs/by-name/xi/xine-ui/package.nix @@ -1,7 +1,8 @@ { lib , stdenv -, fetchurl +, fetchhg , autoreconfHook +, perl , curl , libXext , libXft @@ -23,11 +24,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "xine-ui"; - version = "0.99.14"; + version = "0.99.14-unstable-2024-08-26"; - src = fetchurl { - url = "mirror://sourceforge/xine/xine-ui-${finalAttrs.version}.tar.xz"; - hash = "sha256-1NSQ1c7OcOK7mEnJ5ILyz4evAwLUUbYUR2/cw2Qs2cM="; + src = fetchhg { + url = "http://hg.code.sf.net/p/xine/xine-ui"; + rev = "2beaad6bb92e6732585f68af2e346a24e5ad53a5"; + hash = "sha256-Y08JX9q4w6pSJRCa5mWN11BnA6mZJSO/yn3X8YyZ6E4="; }; outputs = [ "out" "dev" "lib" "man" ]; @@ -36,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook pkg-config shared-mime-info + perl ]; buildInputs = [ From d24640b9dd6c71ddcaa72fe20464d6ff81d10323 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 9 Sep 2024 10:09:07 -0300 Subject: [PATCH 4/7] xine-lib: set strictDeps to true --- pkgs/by-name/xi/xine-lib/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix index 426d5a6c1363..64a2b003892d 100644 --- a/pkgs/by-name/xi/xine-lib/package.nix +++ b/pkgs/by-name/xi/xine-lib/package.nix @@ -79,9 +79,11 @@ stdenv.mkDerivation (finalAttrs: { libxcb ]; + env.NIX_LDFLAGS = "-lxcb-shm"; + enableParallelBuilding = true; - env.NIX_LDFLAGS = "-lxcb-shm"; + strictDeps = true; meta = { homepage = "https://xine.sourceforge.net/"; From 8cd10b74ee99008036c0cf54ea9cc39a7e12faba Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 9 Sep 2024 13:31:10 -0300 Subject: [PATCH 5/7] xine-lib: nixfmt-rfc-style --- pkgs/by-name/xi/xine-lib/package.nix | 81 +++++++++++++++------------- 1 file changed, 45 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix index 64a2b003892d..f0e26e4fe020 100644 --- a/pkgs/by-name/xi/xine-lib/package.nix +++ b/pkgs/by-name/xi/xine-lib/package.nix @@ -1,32 +1,33 @@ -{ lib -, stdenv -, fetchhg -, 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: { @@ -39,7 +40,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-O5lIYmNC2TpoY4QbPMsDWxNOoxdw61967Q4QG9d/+Bg="; }; - outputs = [ "out" "dev" "man" ]; + outputs = [ + "out" + "dev" + "man" + ]; nativeBuildInputs = [ autoreconfHook @@ -55,8 +60,12 @@ stdenv.mkDerivation (finalAttrs: { libGL libGLU libX11 + libX11 + libXext libXext libXinerama + libXinerama + libXv libXv libcaca libcdio @@ -67,16 +76,12 @@ stdenv.mkDerivation (finalAttrs: { libv4l libvorbis libxcb + libxcb ncurses perl speex vcdimager zlib - libX11 - libXext - libXinerama - libXv - libxcb ]; env.NIX_LDFLAGS = "-lxcb-shm"; @@ -88,7 +93,11 @@ stdenv.mkDerivation (finalAttrs: { 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; }; From a2a1553246c209bb996e5668749fbdb781fca2e4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 9 Sep 2024 10:08:50 -0300 Subject: [PATCH 6/7] xine-ui: set strictDeps to true --- pkgs/by-name/xi/xine-ui/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix index d597c50e3b7f..07777c36ebe6 100644 --- a/pkgs/by-name/xi/xine-ui/package.nix +++ b/pkgs/by-name/xi/xine-ui/package.nix @@ -66,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: { LIRC_LIBS="-L ${lirc}/lib -llirc_client"; }; + strictDeps = true; + postInstall = '' substituteInPlace $out/share/applications/xine.desktop \ --replace "MimeType=;" "MimeType=" From fef89792a8a040a04be8da4f02b6d78ed4246318 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 9 Sep 2024 13:31:42 -0300 Subject: [PATCH 7/7] xine-ui: nixfmt-rfc-style - postInstall no longer necessary - use lib.* functions - meta.mainProgram --- pkgs/by-name/xi/xine-ui/package.nix | 62 +++++++++++++++-------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix index 07777c36ebe6..ddbd29be94c1 100644 --- a/pkgs/by-name/xi/xine-ui/package.nix +++ b/pkgs/by-name/xi/xine-ui/package.nix @@ -1,25 +1,26 @@ -{ lib -, stdenv -, fetchhg -, autoreconfHook -, perl -, curl -, libXext -, libXft -, libXi -, libXinerama -, libXtst -, libXv -, libXxf86vm -, libjpeg -, libpng -, lirc -, ncurses -, pkg-config -, readline -, shared-mime-info -, xine-lib -, xorgproto +{ + 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: { @@ -32,7 +33,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Y08JX9q4w6pSJRCa5mWN11BnA6mZJSO/yn3X8YyZ6E4="; }; - outputs = [ "out" "dev" "lib" "man" ]; + outputs = [ + "out" + "dev" + "lib" + "man" + ]; nativeBuildInputs = [ autoreconfHook @@ -62,21 +68,17 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-readline=${readline.dev}" ]; env = { - LIRC_CFLAGS="-I${lirc}/include"; - LIRC_LIBS="-L ${lirc}/lib -llirc_client"; + LIRC_CFLAGS = "-I${lib.getInclude lirc}/include"; + LIRC_LIBS = "-L ${lib.getLib lirc}/lib -llirc_client"; }; strictDeps = true; - 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; + mainProgram = "xine"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; };