Changes between Version 2 and Version 3 of Software/X.Org

Timestamp:

03/02/17 14:58:01 (7 years ago)

Author:

Jens Henrik Goebbert

Comment:

--

Software/X.Org

@@ -57 +57 @@
 
 == 2. Setup X.Org Build Process ==
-Source packages are downloaded by JHBuild automatically. What is required is a 
-* xorg.modules file -> examples: https://cgit.freedesktop.org/xorg/util/modular/plain/xorg.modules
-* xorg.jhbuildrc file -> example: https://cgit.freedesktop.org/xorg/util/modular/plain/jhbuildrc
+Source packages are downloaded by JHBuild automatically. JHBuild requires to configuration files to start the build process:
+* [attachment:xorg.jhbuildrc] ... (based on this [https://cgit.freedesktop.org/xorg/util/modular/plain/jhbuildrc original])
+* [attachment:xorg.modules] ... (based on this [https://cgit.freedesktop.org/xorg/util/modular/plain/xorg.modules original])
 
+=== xorg.jhbuildrc ===
+{{{ #!sh
+moduleset = os.path.join(os.environ['BASE'], 'xorg.modules')
+modules = [ 'The X Window System' ]
+checkoutroot = os.path.join(os.environ['BASE'], 'xorg_sources')
+prefix = os.path.join(os.environ['BASE'], 'xorg_knl')
+os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share/aclocal')
+os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib/pkgconfig') \
+    + ':' + os.path.join(prefix, 'share/pkgconfig') \
+    + ':' + os.path.join(os.environ['PKG_CONFIG_PATH'])
+skip = os.environ['XORG_SKIP_SET']
+branches['mesa-mesa'] = '13.0'
+}}}
 
+=== xorg.modules ===
+In the following we list differences to the general file from [https://cgit.freedesktop.org/xorg/util/modular/plain/xorg.modules HERE].
+{{{ #!sh
+[...]
+  <!--  The X Window System - Meta Module  -->
+[...]
+      <!-- <dep package="The X11 Applications"/>  -->
+[...]
+      <!-- <dep package="xorg-docs"/>  -->
+[...]
+  <!-- X Input and Video Drivers - Meta Module -->
+  <metamodule id="The X Video Drivers">
+    <dependencies>
+      <dep package="xf86-video-dummy"/>
+      <dep package="xf86-video-fbdev"/>
+      <dep package="xf86-video-vesa"/>
+      <dep package="xf86-video-v4l"/>
+    </dependencies>
+  </metamodule>
+[...]
+  <!-- X11 Protocol & Extensions - Modules definition -->
+[...]
+  <repository type="tarball" name="github-tar" href="https://github.com/"/>
+  <autotools id="libepoxy">
+    <pkg-config>epoxy.pc</pkg-config>
+    <branch repo="github-tar"
+            module="anholt/libepoxy/archive/v${version}.tar.gz"
+            version="1.3.1"
+            checkoutdir="libepoxy-${version}"
+            size="284227"/>
+    <dependencies>
+      <dep package="libxtrans"/>
+      <dep package="mesa-mesa"/>
+    </dependencies>
+  </autotools>
+[...]
+  <!-- The X Server -->
+[...]
+       <dep package="libpixman"/>
+       <dep package="app-xkbcomp"/>
+       <dep package="libxshmfence"/>
+       <dep package="libepoxy"/>
+     </dependencies>
+     <suggests>
+[...]
+  <!--  The Mesa 3D Graphics Library - Modules Definition -->
+  <autotools id="mesa-mesa" autogenargs="--enable-xa --enable-gbm --enable-glx --enable-texture-float --enable-gallium-osmesa --enable-gallium-llvm --enable-llvm-shared-libs --enable-dri --with-dri-drivers= --with-gallium-drivers=swrast,swr --disable-osmesa --enable-gallium-osmesa">
+[...]
+}}}
 
-