mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 13:08:39 +03:00
Adding the Unichrome xorg video driver, and updating the Openchrome.
svn path=/nixpkgs/trunk/; revision=18161
This commit is contained in:
parent
09f38459d3
commit
91c8df91bf
@ -76,8 +76,8 @@
|
||||
name = "xf86-video-openchrome-svn-798";
|
||||
src = args.fetchsvn {
|
||||
url = http://svn.openchrome.org/svn/trunk;
|
||||
sha256 = "00kz5775090nwlsxyqrp1wsmislszj58fv3kvq612xgql4vgx4ab";
|
||||
rev = 798;
|
||||
sha256 = "1mhfh1n1x7fnxdbbkbz13lzd57m6xi3n9cblzgm43mz5bamacr02";
|
||||
rev = 816;
|
||||
};
|
||||
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa args.automake args.autoconf args.libtool xorg.libXext];
|
||||
preConfigure = "chmod +x autogen.sh";
|
||||
|
37
pkgs/servers/x11/xorg/unichrome/configure.patch
Normal file
37
pkgs/servers/x11/xorg/unichrome/configure.patch
Normal file
@ -0,0 +1,37 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bacea8a..691a9fa 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -77,6 +77,14 @@ AC_MSG_CHECKING([X protocol headers directory])
|
||||
protodir=$(pkg-config --variable=includex11dir xproto)
|
||||
AC_MSG_RESULT([$protodir])
|
||||
|
||||
+AC_MSG_CHECKING([X extension protocol headers directory])
|
||||
+extprotodir=$(pkg-config --variable=includedir xextproto)
|
||||
+AC_MSG_RESULT([$extprotodir])
|
||||
+
|
||||
+AC_MSG_CHECKING([XvMC headers directory])
|
||||
+xvmcdir=$(pkg-config --variable=includedir xvmc)
|
||||
+AC_MSG_RESULT([$extprotodir])
|
||||
+
|
||||
# Checks for libraries.
|
||||
|
||||
# Checks for header files.
|
||||
@@ -139,7 +147,7 @@ if test "x$have_xvmc" != xno; then
|
||||
[have_xvmc_h="yes"], [have_xvmc_h="no"])
|
||||
AC_CHECK_FILE([${protodir}/extensions/vldXvMC.h],
|
||||
[have_vldxvmc_h="yes"], [have_vldxvmc_h="no"])
|
||||
- AC_CHECK_FILE([${protodir}/extensions/XvMClib.h],
|
||||
+ AC_CHECK_FILE([${xvmcdir}/X11/extensions/XvMClib.h],
|
||||
[have_xvmclib_h="yes"], [have_xvmclib_h="no"])
|
||||
fi
|
||||
|
||||
@@ -225,7 +233,7 @@ fi
|
||||
CFLAGS="$SAVED_CFLAGS"
|
||||
|
||||
# in the xserver 1.7 timeframe, the protocol headers were split up.
|
||||
-AC_CHECK_FILE([${protodir}/extensions/dpmsconst.h],
|
||||
+AC_CHECK_FILE([${extprotodir}/X11/extensions/dpmsconst.h],
|
||||
[have_dpmsconst_h="yes"], [have_dpmsconst_h="no"])
|
||||
if test "x$have_dpmsconst_h" = xyes; then
|
||||
AC_DEFINE(HAVE_DPMSCONST_H, 1, [Proto Headers have dpmsconst.h])
|
30
pkgs/servers/x11/xorg/unichrome/default.nix
Normal file
30
pkgs/servers/x11/xorg/unichrome/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{stdenv, fetchgit, pkgconfig, fontsproto, libdrm, libpciaccess, randrproto, renderproto,
|
||||
videoproto, libX11,
|
||||
xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake,
|
||||
autoconf, libtool, libXext, utilmacros}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xf86-video-unichrome-git";
|
||||
src = fetchgit {
|
||||
url = http://svn.openchrome.org/svn/trunk;
|
||||
md5 = "6e5e0f8ee204af2385a02e502d1ca8f1";
|
||||
rev = "6260e0fc9f0754d101dda014a8f4b5f76f58e978";
|
||||
};
|
||||
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto
|
||||
videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC
|
||||
glproto mesa automake autoconf libtool libXext utilmacros ];
|
||||
preConfigure = "chmod +x autogen.sh";
|
||||
prePatch = ''
|
||||
sed s,/bin/bash,/bin/sh, -i git_version.sh
|
||||
'';
|
||||
patches = [ ./configure.patch ];
|
||||
configureScript = "./autogen.sh";
|
||||
|
||||
meta = {
|
||||
homepage = "http://unichrome.sourceforge.net/";
|
||||
description = "Xorg video driver for the S3 Unichrome family of integrated graphics devices";
|
||||
license = "free";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
@ -5157,6 +5157,13 @@ let
|
||||
inherit fetchurl stdenv automake autoconf libtool xorg composedArgsAndFun;
|
||||
};
|
||||
|
||||
xorgVideoUnichrome = import ../servers/x11/xorg/unichrome/default.nix {
|
||||
inherit stdenv fetchgit pkgconfig libdrm mesa automake autoconf libtool;
|
||||
inherit (xorg) fontsproto libpciaccess randrproto renderproto videoproto
|
||||
libX11 xextproto xf86driproto xorgserver xproto libXvMC glproto
|
||||
libXext utilmacros;
|
||||
};
|
||||
|
||||
zabbixAgent = import ../servers/monitoring/zabbix {
|
||||
inherit fetchurl stdenv;
|
||||
enableServer = false;
|
||||
|
Loading…
Reference in New Issue
Block a user