Bug 17543 - xf86-video-intel-2.5-branch build fail due to libdrm_intel change
Summary: xf86-video-intel-2.5-branch build fail due to libdrm_intel change
Status: VERIFIED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Driver/intel (show other bugs)
Version: git
Hardware: Other Linux (All)
: highest blocker
Assignee: Jesse Barnes
QA Contact: Xorg Project Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-09-11 19:31 UTC by liuhaien
Modified: 2008-09-15 18:40 UTC (History)
2 users (show)

See Also:
i915 platform:
i915 features:


Attachments

Description liuhaien 2008-09-11 19:31:25 UTC
Libdrm:		(master)973c634eaa54ee4085a72102c690bc643cb2d7a8
Mesa:		(master)35fd72756a05463568d94862f4fcd234903e1204
Xserver:		(master)31c62495f1de6e9ba41e1f6d7fa263eeb849129b
2D driver: 2.5branch  94a86fa51a931f0059ea17728f857ec92cec5b16
-------------------
2d driver build fail with below error:
**********************************************************
In file included from i830.h:84,
                 from i810_driver.c:89:
/opt/X11R7/include/intel_bufmgr.h:42: error: redefinition of ‘struct _dri_bo’
In file included from i830.h:738,
                 from i810_driver.c:89:
i830_batchbuffer.h: In function ‘intel_batch_emit_reloc’:
i830_batchbuffer.h:71: warning: implicit declaration of function ‘intel_bo_emit_reloc’
i830_batchbuffer.h:71: warning: nested extern declaration of ‘intel_bo_emit_reloc’
make[4]: *** [i810_driver.lo] Error 1
make[4]: Leaving directory `/GFX/build/component/Xf86_video_intel_stable/xf86_video_intel/src'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/GFX/build/component/Xf86_video_intel_stable/xf86_video_intel/src'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/GFX/build/component/Xf86_video_intel_stable/xf86_video_intel/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/GFX/build/component/Xf86_video_intel_stable/xf86_video_intel'
make: *** [all] Error 2
****************************************************************
Comment 1 Gordon Jin 2008-09-11 19:57:51 UTC
My understanding is this is introduced by Eric's libdrm_intel change: it's already changed in libdrm master and xf86-video-intel master, and need cherry-pick to xf86-video-intel-2.5-branch.
Eric and Jesse should have been aware of this issue.
Comment 2 liuhaien 2008-09-11 20:02:42 UTC
I try to bisect and find this commit of Libdrm (master tip) cause this issue:

738e36acbce24df0ccadb499c5cf62ccb74f56df is first bad commit
commit 738e36acbce24df0ccadb499c5cf62ccb74f56df
Author: Eric Anholt <eric@anholt.net>
Date:   Fri Sep 5 10:35:32 2008 +0100

    Move intel libdrm stuff to libdrm_intel.so

    dri_bufmgr.h is replaced by intel_bufmgr.h, and several functions are renamed,
    though the structures and many functions remain dri_bufmgr_* and dri_bo_*
Comment 3 Jesse Barnes 2008-09-12 14:20:11 UTC
Should be fixed now, I pulled the bits in from master.
Comment 4 liuhaien 2008-09-15 18:40:24 UTC
verified.


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.