diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-07-12 12:32:52 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-07-12 16:15:23 +0200 |
| commit | e1cb9d303e17da138ffb9c6a5f4ea0f69bac4ada (patch) | |
| tree | 274e3bef522e768899e012776e80df1117dfa39f /patches | |
| parent | 199be447629afce7ee964ec672230c6e0e2558a4 (diff) | |
| download | ptxdist-e1cb9d303e17da138ffb9c6a5f4ea0f69bac4ada.tar.gz ptxdist-e1cb9d303e17da138ffb9c6a5f4ea0f69bac4ada.tar.xz | |
libdrm: cleanup
also add patch to remove unconditional libpciaccess dependency
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libdrm-2.4.26/0001-pciaccess-is-only-needed-for-intel.patch | 37 | ||||
| l--------- | patches/libdrm-2.4.26/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/libdrm-2.4.26/series | 3 |
3 files changed, 41 insertions, 0 deletions
diff --git a/patches/libdrm-2.4.26/0001-pciaccess-is-only-needed-for-intel.patch b/patches/libdrm-2.4.26/0001-pciaccess-is-only-needed-for-intel.patch new file mode 100644 index 000000000..d9a2e7b4f --- /dev/null +++ b/patches/libdrm-2.4.26/0001-pciaccess-is-only-needed-for-intel.patch @@ -0,0 +1,37 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 12 Jul 2011 11:49:56 +0200 +Subject: [PATCH] pciaccess is only needed for intel + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure.ac | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cd3ac23..24b1812 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,10 +51,6 @@ PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) + AC_SUBST(PTHREADSTUBS_CFLAGS) + AC_SUBST(PTHREADSTUBS_LIBS) + +-PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) +-AC_SUBST(PCIACCESS_CFLAGS) +-AC_SUBST(PCIACCESS_LIBS) +- + pkgconfigdir=${libdir}/pkgconfig + AC_SUBST(pkgconfigdir) + AC_ARG_ENABLE([udev], +@@ -256,6 +252,12 @@ if test "x$INTEL" != "xno" -o "x$RADEON" != "xno"; then + fi + fi + ++if test "x$INTEL" != "xno"; then ++ PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) ++ AC_SUBST(PCIACCESS_CFLAGS) ++ AC_SUBST(PCIACCESS_LIBS) ++fi ++ + AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" != "xno"]) + AM_CONDITIONAL(HAVE_RADEON, [test "x$RADEON" != "xno"]) + if test "x$RADEON" = xyes; then diff --git a/patches/libdrm-2.4.26/autogen.sh b/patches/libdrm-2.4.26/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/libdrm-2.4.26/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/libdrm-2.4.26/series b/patches/libdrm-2.4.26/series new file mode 100644 index 000000000..be34db0b5 --- /dev/null +++ b/patches/libdrm-2.4.26/series @@ -0,0 +1,3 @@ +# generated by git-ptx-patches +0001-pciaccess-is-only-needed-for-intel.patch +# 8cbdc1fd1e1c8a3277b5b4d660d3b26a - git-ptx-patches magic |