[Mesa-dev] [PATCH 1/3] Only require libdrm if direct rendering is actually enabled.

[Jakob Bornecrantz]

On Fri, Apr 8, 2011 at 7:57 PM, Jon TURNEY <jon.turney at dronecode.org.uk> wrote:
> On 08/04/2011 18:26, Jakob Bornecrantz wrote:
>> On Fri, Apr 8, 2011 at 7:12 PM, Jon TURNEY <jon.turney at dronecode.org.uk> wrote:
>>> On 23/03/2011 18:51, Jon TURNEY wrote:
>>>> On 15/03/2011 00:35, Jakob Bornecrantz wrote:
>>>>> On Mon, Mar 14, 2011 at 11:08 PM, Jon TURNEY
>>>>>>  dnl
>>>>>>  dnl libGL configuration per driver
>>>>>>  dnl
>>>>>> @@ -762,12 +770,17 @@ dri|no) # these checks are still desired when there is no mesa_driver
>>>>>>         AC_MSG_ERROR([Can't use static libraries for DRI drivers])
>>>>>>     fi
>>>>>>
>>>>>> -    # Check for libdrm
>>>>>> -    PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
>>>>>> -    PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
>>>>>>     PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
>>>>>> -    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"
>>>>>> -    DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
>>>>>> +    GL_PC_REQ_PRIV="glproto >= $GLPROTO_REQUIRED"
>>>>>
>>>>> Isn't glproto checked above? And if not for some reason isn't it
>>>>> dropped below when driglx_direct==yes?
>>>>
>>>> I'm not sure I understand this comment.
>>>>
>>>> The PKG_CHECK_MODULES checks for the glproto package.  This always happens and
>>>> this line isn't changing.
>>>>
>>>> GL_PC_REQ_PRIV is subsituted in the Requires.private: of gl.pc.in when gl.pc
>>>> is made, to give the library dependencies for the libGL we have built.  When
>>>> building with driglx_direct=yes, additional dependencies on libdrm and
>>>> dri2proto are added.
>>>>
>>>> The intent of this change is that if --disable-driglx-direct is used, we don't
>>>> need to check for libdrm or dri2proto, and the libGL built doesn't depend on
>>>> them.  If --enable-driglx-direct is used (the default), we check for and
>>>> depend on libdrm and dri2proto as before.
>>>>
>>>> Thanks for the review.
>>>
>>> Ping?
>>>
>>> Does this address your concerns, or are there changes you would like me to
>>> make to this patch?
>>
>> Yeah it looks good, I missed that it adds GL_PC_REQ_PRIV to itself
>> when direct rendering is enabled. The first part of that question
>> was/is that isn't glproto checked twice or is GL_PC_REQ_PRIV used to
>> setup some flags?
>
> GL_PC_REQ_PRIV is only used to make .pc files, it's never used with
> PKG_CHECK_MODULES, so glproto is only checked for once.

Thanks! My RB still stands.

Cheers Jakob.