mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-24 09:31:29 +00:00
smpeg: drop gtk2 and opengl player (#544591)
This commit is contained in:
@@ -1,15 +0,0 @@
|
||||
diff '--color=auto' -Naur smpeg-r390.orig/acinclude/gtk-2.0.m4 smpeg-r390/acinclude/gtk-2.0.m4
|
||||
--- smpeg-r390.orig/acinclude/gtk-2.0.m4 1970-01-01 08:00:01.000000000 +0800
|
||||
+++ smpeg-r390/acinclude/gtk-2.0.m4 2021-12-16 15:52:17.776001058 +0800
|
||||
@@ -24,10 +24,8 @@
|
||||
|
||||
no_gtk=""
|
||||
|
||||
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
-
|
||||
if test x$PKG_CONFIG != xno ; then
|
||||
- if pkg-config --atleast-pkgconfig-version 0.7 ; then
|
||||
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
|
||||
:
|
||||
else
|
||||
echo "*** pkg-config too old; version 0.7 or better required."
|
||||
@@ -7,11 +7,8 @@
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
gtk2,
|
||||
m4,
|
||||
pkg-config,
|
||||
libGLU,
|
||||
libGL,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
@@ -29,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [ ./libx11.patch ] ++ [
|
||||
./format.patch
|
||||
./gcc6.patch
|
||||
./gtk.patch
|
||||
# These patches remove use of the `register` storage class specifier,
|
||||
# allowing smpeg to build with clang 16, which defaults to C++17.
|
||||
(fetchpatch {
|
||||
@@ -50,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--enable-gtk-player=no"
|
||||
"--enable-opengl-player=no"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
@@ -61,11 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
gtk2
|
||||
libGLU
|
||||
libGL
|
||||
];
|
||||
|
||||
outputs = [
|
||||
@@ -93,10 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--prefix PKG_CONFIG_PATH ":" "${lib.getDev SDL}/lib/pkgconfig"
|
||||
'';
|
||||
|
||||
env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://icculus.org/smpeg/";
|
||||
description = "MPEG decoding library";
|
||||
|
||||
Reference in New Issue
Block a user