ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 11:00:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #158703 from c0bw3b/pkg/xinelib

Browse Source 
Unbreak xine-lib, xine-ui and dvdstyler
This commit is contained in:
Anderson Torres 2022-02-14 23:29:44 -03:00 committed by GitHub
commit 558f5ae9e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pkgs/applications/video/dvdstyler/default.nix
View File

@ -3,17 +3,21 @@
, fetchurl
, bison
, cdrtools
, docbook5
, docbook_xml_dtd_412
, docbook-xsl-nons
, dvdauthor
, dvdplusrwtools
, ffmpeg
, flex
, fontconfig
, gettext
, glib
, gobject-introspection
, libexif
, makeWrapper
, libjpeg
, pkg-config
, wxGTK30
, wrapGAppsHook
, wxGTK30-gtk3 # crash with wxGTK30 with GTK2 compat
, wxSVG
, xine-ui
, xmlto
@ -37,43 +41,50 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [
bison
docbook_xml_dtd_412
docbook-xsl-nons
flex
gettext
gobject-introspection
pkg-config
wrapGAppsHook
xmlto
zip
];
buildInputs = [
bison
cdrtools
docbook5
dvdauthor
dvdplusrwtools
ffmpeg
flex
fontconfig
gettext
glib
libexif
makeWrapper
libjpeg
wxSVG
wxGTK30
wxGTK30-gtk3
xine-ui
xmlto
zip
]
++ optionals dvdisasterSupport [ dvdisaster ]
++ optionals udevSupport [ udev ]
++ optionals dbusSupport [ dbus ]
++ optionals thumbnailSupport [ libgnomeui ];
enableParallelBuilding = true;
postInstall = let
binPath = makeBinPath [
preFixup = let
binPath = makeBinPath ([
cdrtools
dvdauthor
dvdplusrwtools
]; in
] ++ optionals dvdisasterSupport [ dvdisaster ]);
in
''
wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}"
'';
gappsWrapperArgs+=(
--prefix PATH : "${binPath}"
)
'';
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://www.dvdstyler.org/";

14
pkgs/applications/video/xine-ui/default.nix
View File

@ -1,6 +1,8 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, autoreconfHook
, curl
, libjpeg
, libpng
@ -22,7 +24,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-sjgtB1xysbEAOeDpAxDMhsjZEDWMU1We2C09WEIB9cU=";
};
patches = [
(fetchpatch {
# Fix build on aarch64
name = "xine-ui_FTBS_aarch64.patch";
url = "https://salsa.debian.org/debian/xine-ui/-/raw/b2f04f64947a8975a805950e7e67b15cb44007ef/debian/patches/backport/0003-Fix-build.patch";
sha256 = "03f8nkm7q11v5vssl1bj500ja4ljz4y752mfk22k2g4djkwimx62";
})
];
nativeBuildInputs = [
autoreconfHook
pkg-config
shared-mime-info
];
@ -57,7 +69,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://xinehq.de/";
homepage = "http://xine.sourceforge.net/";
description = "Xlib-based frontend for Xine video player";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];

20
pkgs/development/libraries/xine-lib/default.nix
View File

@ -1,8 +1,10 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, aalib
, alsa-lib
, autoconf
, ffmpeg
, flac
, libGL
@ -33,7 +35,23 @@ stdenv.mkDerivation rec {
sha256 = "sha256-71GyHRDdoQRfp9cRvZFxz9rwpaKHQjO88W/98o7AcAU=";
};
patches = [
# Fix build with libcaca 0.99.beta20 ; remove for xine-lib 1.2.12
(fetchpatch {
name = "xine-lib-libcaca-0.99.beta20-fix.patch";
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/010-xine-lib-libcaca-0.99.beta20-fix.patch";
sha256 = "088141x1yp84y09x3s01v21yzas2bwavxz9v30z5hyq6c3syrmgr";
})
# Fix build with ffmpeg 5.0 ; remove for xine-lib 1.2.12
(fetchpatch {
name = "xine-lib-ffmpeg-5.0-fix.patch";
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/020-xine-lib-ffmpeg-5.0-fix.patch";
sha256 = "15ff15bqxq1nqqazfbmfq6swrdjr2raxyq7hx6k0r61izhf0g8ld";
})
];
nativeBuildInputs = [
autoconf
pkg-config
perl
];
@ -71,7 +89,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://www.xinehq.de/";
homepage = "http://xine.sourceforge.net/";
description = "A high-performance, portable and reusable multimedia playback engine";
license = with licenses; [ gpl2Plus lgpl2Plus ];
maintainers = with maintainers; [ AndersonTorres ];