[PATCH] libdrm: Upgrade to 2.4.65

[PATCH] libdrm: Upgrade to 2.4.65

[Saul Wold]

Rebased patch to reflect changes in Makefile

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../recipes-graphics/drm/libdrm/installtests.patch | 24 ++++++++++++----------
 .../drm/{libdrm_2.4.62.bb => libdrm_2.4.65.bb}     |  5 +++--
 2 files changed, 16 insertions(+), 13 deletions(-)
 rename meta/recipes-graphics/drm/{libdrm_2.4.62.bb => libdrm_2.4.65.bb} (92%)

diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch
index 1175dae..f460ef5 100644
--- a/meta/recipes-graphics/drm/libdrm/installtests.patch
+++ b/meta/recipes-graphics/drm/libdrm/installtests.patch
@@ -4,20 +4,22 @@ Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Yu Ke <ke.yu@intel.com>
 
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index bf1987f..d909e19 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -27,10 +27,11 @@ AM_CPPFLAGS = \
+Index: libdrm-2.4.65/tests/Makefile.am
+===================================================================
+--- libdrm-2.4.65.orig/tests/Makefile.am
++++ libdrm-2.4.65/tests/Makefile.am
+@@ -29,9 +29,11 @@ AM_CFLAGS = \
  
  LDADD = $(top_builddir)/libdrm.la
  
 -check_PROGRAMS = \
+-	dristat \
+-	drmstat
 +bin_PROGRAMS = \
- 	dristat \
- 	drmstat
- 
++        dristat \
++        drmstat
++ 
 +check_PROGRAMS =
- if HAVE_NOUVEAU
- SUBDIRS += nouveau
- endif
+ 
+ dristat_LDADD = -lm
+ 
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.62.bb b/meta/recipes-graphics/drm/libdrm_2.4.65.bb
similarity index 92%
rename from meta/recipes-graphics/drm/libdrm_2.4.62.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.65.bb
index ea6305e..8390fb0 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.62.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.65.bb
@@ -12,8 +12,9 @@ DEPENDS = "libpthread-stubs udev libpciaccess"
 
 SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
            file://installtests.patch "
-SRC_URI[md5sum] = "c9291bae0e5ca65d1483821d3698d3ab"
-SRC_URI[sha256sum] = "906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc"
+
+SRC_URI[md5sum] = "de49916e5f8aef4eba55223c79709b05"
+SRC_URI[sha256sum] = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4"
 
 inherit autotools pkgconfig
 
-- 
2.5.0

Re: [PATCH] libdrm: Upgrade to 2.4.65

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 3119 bytes --]

Buildhistory-diff says:

packages/corei7-64-poky-linux/libdrm/libdrm: PKG changed from libdrm2 to
libdrm [default] - may indicate debian renaming failure

There's a new library (libdrm_amdgpu.so) which needs to be split out.  To
be honest the splitting should be automated instead of done manually to
stop this happening in the future.

Ross

On 21 December 2015 at 16:58, Saul Wold <sgw@linux.intel.com> wrote:

> Rebased patch to reflect changes in Makefile
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../recipes-graphics/drm/libdrm/installtests.patch | 24
> ++++++++++++----------
>  .../drm/{libdrm_2.4.62.bb => libdrm_2.4.65.bb}     |  5 +++--
>  2 files changed, 16 insertions(+), 13 deletions(-)
>  rename meta/recipes-graphics/drm/{libdrm_2.4.62.bb => libdrm_2.4.65.bb}
> (92%)
>
> diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch
> b/meta/recipes-graphics/drm/libdrm/installtests.patch
> index 1175dae..f460ef5 100644
> --- a/meta/recipes-graphics/drm/libdrm/installtests.patch
> +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch
> @@ -4,20 +4,22 @@ Upstream-Status: Inappropriate [configuration]
>
>  Signed-off-by: Yu Ke <ke.yu@intel.com>
>
> -diff --git a/tests/Makefile.am b/tests/Makefile.am
> -index bf1987f..d909e19 100644
> ---- a/tests/Makefile.am
> -+++ b/tests/Makefile.am
> -@@ -27,10 +27,11 @@ AM_CPPFLAGS = \
> +Index: libdrm-2.4.65/tests/Makefile.am
> +===================================================================
> +--- libdrm-2.4.65.orig/tests/Makefile.am
> ++++ libdrm-2.4.65/tests/Makefile.am
> +@@ -29,9 +29,11 @@ AM_CFLAGS = \
>
>   LDADD = $(top_builddir)/libdrm.la
>
>  -check_PROGRAMS = \
> +-      dristat \
> +-      drmstat
>  +bin_PROGRAMS = \
> -       dristat \
> -       drmstat
> -
> ++        dristat \
> ++        drmstat
> ++
>  +check_PROGRAMS =
> - if HAVE_NOUVEAU
> - SUBDIRS += nouveau
> - endif
> +
> + dristat_LDADD = -lm
> +
> diff --git a/meta/recipes-graphics/drm/libdrm_2.4.62.bb
> b/meta/recipes-graphics/drm/libdrm_2.4.65.bb
> similarity index 92%
> rename from meta/recipes-graphics/drm/libdrm_2.4.62.bb
> rename to meta/recipes-graphics/drm/libdrm_2.4.65.bb
> index ea6305e..8390fb0 100644
> --- a/meta/recipes-graphics/drm/libdrm_2.4.62.bb
> +++ b/meta/recipes-graphics/drm/libdrm_2.4.65.bb
> @@ -12,8 +12,9 @@ DEPENDS = "libpthread-stubs udev libpciaccess"
>
>  SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
>             file://installtests.patch "
> -SRC_URI[md5sum] = "c9291bae0e5ca65d1483821d3698d3ab"
> -SRC_URI[sha256sum] =
> "906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc"
> +
> +SRC_URI[md5sum] = "de49916e5f8aef4eba55223c79709b05"
> +SRC_URI[sha256sum] =
> "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4"
>
>  inherit autotools pkgconfig
>
> --
> 2.5.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 4917 bytes --]