[PATCH 1/3] libdrm_intel.pc: don't include ${includedir}/drm

[PATCH 1/3] libdrm_intel.pc: don't include ${includedir}/drm

[Julien Cristau]

intel_bufmgr.h is installed in ${includedir} directly, and the other
headers are taken care of by libdrm.pc's Cflags.

Signed-off-by: Julien Cristau <jcristau@debian.org>
---
 intel/libdrm_intel.pc.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/intel/libdrm_intel.pc.in b/intel/libdrm_intel.pc.in
index b93f1c6..e8080d9 100644
--- a/intel/libdrm_intel.pc.in
+++ b/intel/libdrm_intel.pc.in
@@ -8,4 +8,4 @@ Description: Userspace interface to kernel DRM services
 Version: @PACKAGE_VERSION@
 Requires: libdrm
 Libs: -L${libdir} -ldrm_intel
-Cflags: -I${includedir} -I${includedir}/drm
+Cflags: -I${includedir}
-- 
1.6.6.1


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--

[PATCH 2/3] libdrm_nouveau requires libdrm

[Julien Cristau]

nouveau_drmif.h includes xf86drm.h.

Signed-off-by: Julien Cristau <jcristau@debian.org>
---
 nouveau/libdrm_nouveau.pc.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/nouveau/libdrm_nouveau.pc.in b/nouveau/libdrm_nouveau.pc.in
index 7ef49e5..6ae6287 100644
--- a/nouveau/libdrm_nouveau.pc.in
+++ b/nouveau/libdrm_nouveau.pc.in
@@ -8,3 +8,4 @@ Description: Userspace interface to nouveau kernel DRM services
 Version: 0.6
 Libs: -L${libdir} -ldrm_nouveau
 Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/nouveau
+Requires.private: libdrm
-- 
1.6.6.1


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--

[PATCH 3/3] Install headers to $(includedir)/libdrm

[Julien Cristau]

Avoids conflicts with kernel headers.

Signed-off-by: Julien Cristau <jcristau@debian.org>
---
This was suggested by Eric so distros can let the kernel install drm
headers, but provide updated headers from libdrm so we can build new
drivers regardless of the kernel version.

 include/drm/Makefile.am      |    2 +-
 libdrm.pc.in                 |    2 +-
 nouveau/Makefile.am          |    2 +-
 nouveau/libdrm_nouveau.pc.in |    2 +-
 radeon/Makefile.am           |    2 +-
 radeon/libdrm_radeon.pc.in   |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/drm/Makefile.am b/include/drm/Makefile.am
index 9046955..43695bd 100644
--- a/include/drm/Makefile.am
+++ b/include/drm/Makefile.am
@@ -22,7 +22,7 @@
 # however, r300 and via need their reg headers installed in order to build.
 # better solutions are welcome.
 
-klibdrmincludedir = ${includedir}/drm
+klibdrmincludedir = ${includedir}/libdrm
 klibdrminclude_HEADERS = \
 	drm.h \
 	drm_mode.h \
diff --git a/libdrm.pc.in b/libdrm.pc.in
index 6e00597..b46e2a6 100644
--- a/libdrm.pc.in
+++ b/libdrm.pc.in
@@ -7,4 +7,4 @@ Name: libdrm
 Description: Userspace interface to kernel DRM services
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldrm
-Cflags: -I${includedir} -I${includedir}/drm
+Cflags: -I${includedir} -I${includedir}/libdrm
diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am
index 5d759c5..b6d214a 100644
--- a/nouveau/Makefile.am
+++ b/nouveau/Makefile.am
@@ -34,7 +34,7 @@ libdrm_nouveaucommoninclude_HEADERS = \
 				nouveau_reloc.h
 
 
-libdrm_nouveauincludedir = ${includedir}/drm
+libdrm_nouveauincludedir = ${includedir}/libdrm
 libdrm_nouveauinclude_HEADERS = \
 				nouveau_drmif.h
 
diff --git a/nouveau/libdrm_nouveau.pc.in b/nouveau/libdrm_nouveau.pc.in
index 6ae6287..c78a28a 100644
--- a/nouveau/libdrm_nouveau.pc.in
+++ b/nouveau/libdrm_nouveau.pc.in
@@ -7,5 +7,5 @@ Name: libdrm_nouveau
 Description: Userspace interface to nouveau kernel DRM services
 Version: 0.6
 Libs: -L${libdir} -ldrm_nouveau
-Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/nouveau
+Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/nouveau
 Requires.private: libdrm
diff --git a/radeon/Makefile.am b/radeon/Makefile.am
index 29af1df..de78232 100644
--- a/radeon/Makefile.am
+++ b/radeon/Makefile.am
@@ -41,7 +41,7 @@ libdrm_radeon_la_SOURCES = \
 	radeon_bo.c \
 	radeon_cs.c
 
-libdrm_radeonincludedir = ${includedir}/drm
+libdrm_radeonincludedir = ${includedir}/libdrm
 libdrm_radeoninclude_HEADERS = \
 	radeon_bo.h \
 	radeon_cs.h \
diff --git a/radeon/libdrm_radeon.pc.in b/radeon/libdrm_radeon.pc.in
index ab703e1..68ef0ab 100644
--- a/radeon/libdrm_radeon.pc.in
+++ b/radeon/libdrm_radeon.pc.in
@@ -7,4 +7,4 @@ Name: libdrm_radeon
 Description: Userspace interface to kernel DRM services for radeon
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -ldrm_radeon
-Cflags: -I${includedir} -I${includedir}/drm
+Cflags: -I${includedir} -I${includedir}/libdrm
-- 
1.6.6.1


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--

Re: [PATCH 3/3] Install headers to $(includedir)/libdrm

[Julien Cristau]

On Fri, Feb 26, 2010 at 19:07:24 +0100, Julien Cristau wrote:

> Avoids conflicts with kernel headers.
> 
> Signed-off-by: Julien Cristau <jcristau@debian.org>
> ---
> This was suggested by Eric so distros can let the kernel install drm
> headers, but provide updated headers from libdrm so we can build new
> drivers regardless of the kernel version.
> 
any comments on this?

Cheers,
Julien

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--

Re: [PATCH 3/3] Install headers to $(includedir)/libdrm

[Rémi Cardona]

Le 10/03/2010 13:13, Julien Cristau a écrit :
> any comments on this?

Reviewed-by: Rémi Cardona <remi@gentoo.org>

The whole series looks nice. Just got me wondering why libdrm_intel
installs its only header in ${includedir} and not in /drm or /libdrm...

Cheers,

Rémi

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--

Re: [PATCH 3/3] Install headers to $(includedir)/libdrm

[Eric Anholt]

[-- Attachment #1.1: Type: text/plain, Size: 242 bytes --]

On Fri, 26 Feb 2010 19:07:24 +0100, Julien Cristau <jcristau@debian.org> wrote:
> Avoids conflicts with kernel headers.
> 
> Signed-off-by: Julien Cristau <jcristau@debian.org>

Applied this series, plus moving the intel file.  Thanks!

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 345 bytes --]

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev

[-- Attachment #3: Type: text/plain, Size: 161 bytes --]

--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

Re: [PATCH 2/3] libdrm_nouveau requires libdrm

[Kristian Høgsberg]

On Fri, Feb 26, 2010 at 1:07 PM, Julien Cristau <jcristau@debian.org> wrote:
> nouveau_drmif.h includes xf86drm.h.

If it's a source level dependency it should be a regular Requires: in
the .pc.  Requires.private: is only for private libraries you link to
but don't expose their API in your header files.  The idea is (AFAIK)
that you can ask pkg-config to list all libraries to link to for
static linking, in which case pkg-config needs a way to find all
needed libraries.  It even looks like Requires.private has been
obsoleted by Libs.private in recent pkg-config.

> Signed-off-by: Julien Cristau <jcristau@debian.org>
> ---
>  nouveau/libdrm_nouveau.pc.in |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/nouveau/libdrm_nouveau.pc.in b/nouveau/libdrm_nouveau.pc.in
> index 7ef49e5..6ae6287 100644
> --- a/nouveau/libdrm_nouveau.pc.in
> +++ b/nouveau/libdrm_nouveau.pc.in
> @@ -8,3 +8,4 @@ Description: Userspace interface to nouveau kernel DRM services
>  Version: 0.6
>  Libs: -L${libdir} -ldrm_nouveau
>  Cflags: -I${includedir} -I${includedir}/drm -I${includedir}/nouveau
> +Requires.private: libdrm
> --
> 1.6.6.1
>
>
> ------------------------------------------------------------------------------
> Download Intel&#174; Parallel Studio Eval
> Try the new software tools for yourself. Speed compiling, find bugs
> proactively, and fine-tune applications for parallel performance.
> See why Intel Parallel Studio got high marks during beta.
> http://p.sf.net/sfu/intel-sw-dev
> --
> _______________________________________________
> Dri-devel mailing list
> Dri-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/dri-devel
>

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

Re: [PATCH 2/3] libdrm_nouveau requires libdrm

[Julien Cristau]

On Fri, Feb 26, 2010 at 13:38:59 -0500, Kristian Høgsberg wrote:

> On Fri, Feb 26, 2010 at 1:07 PM, Julien Cristau <jcristau@debian.org> wrote:
> > nouveau_drmif.h includes xf86drm.h.
> 
> If it's a source level dependency it should be a regular Requires: in
> the .pc.  Requires.private: is only for private libraries you link to
> but don't expose their API in your header files.  The idea is (AFAIK)
> that you can ask pkg-config to list all libraries to link to for
> static linking, in which case pkg-config needs a way to find all
> needed libraries.  It even looks like Requires.private has been
> obsoleted by Libs.private in recent pkg-config.
> 
That's not what the pkg-config maintainer says...

http://err.no/personal/blog/2008/Mar/25

Using Requires.private lets us get the necessary cflags, but avoids
linking to the library if not using --static.

Cheers,
Julien

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--

Re: [PATCH 2/3] libdrm_nouveau requires libdrm

[Kristian Høgsberg]

2010/2/26 Julien Cristau <jcristau@debian.org>:
> On Fri, Feb 26, 2010 at 13:38:59 -0500, Kristian Høgsberg wrote:
>
>> On Fri, Feb 26, 2010 at 1:07 PM, Julien Cristau <jcristau@debian.org> wrote:
>> > nouveau_drmif.h includes xf86drm.h.
>>
>> If it's a source level dependency it should be a regular Requires: in
>> the .pc.  Requires.private: is only for private libraries you link to
>> but don't expose their API in your header files.  The idea is (AFAIK)
>> that you can ask pkg-config to list all libraries to link to for
>> static linking, in which case pkg-config needs a way to find all
>> needed libraries.  It even looks like Requires.private has been
>> obsoleted by Libs.private in recent pkg-config.
>>
> That's not what the pkg-config maintainer says...
>
> http://err.no/personal/blog/2008/Mar/25
>
> Using Requires.private lets us get the necessary cflags, but avoids
> linking to the library if not using --static.

Oh, I see.  Well it sounds like at some point Requires.private did
what I thought it did.  Thanks for the pointer.

Kristian

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel