Changeset 82f15d2 for x/installing


Ignore:
Timestamp:
07/23/2014 06:26:43 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485
Children:
da6f6267
Parents:
006e35c
Message:

Rename x7driver.xml to x7driver-systemd.xml because it's now way different. Merge changes from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13592 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
x/installing
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed

  • x/installing/installing.xml

    r006e35c r82f15d2  
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config-systemd.xml"/>
    7272  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server-systemd.xml"/>
    73   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver-systemd.xml"/>
    7474  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="twm.xml"/>
    7575  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>

  • x/installing/x7driver-systemd.xml

    r006e35c r82f15d2  
    4242    </note>
    4343
    44     <!-- <sect3 id="xorg-modules">
    45       <title>Xorg Modules</title>
    46 
    47       <itemizedlist spacing="compact">
    48         <listitem>
    49           <para>
    50             <xref linkend="glamor-egl"/>
    51           </para>
    52         </listitem>
    53       </itemizedlist>
    54 
    55     </sect3> -->
    56 
    5744    <sect3 id="xorg-input-drivers">
    5845      <title>Xorg Input Drivers</title>
    5946
    6047      <itemizedlist spacing="compact">
    61         <!-- <listitem>
    62           <para>
    63             <xref linkend="libevdev"/>
    64           </para>
    65         </listitem> -->
    6648        <listitem>
    6749          <para>
    … …  
    166148    </sect3>
    167149
    168 <!--
    169     <sect3 id="hw-video-acceleration">
    170       <title>Hardware Video Acceleration</title>
    171 
    172       <itemizedlist spacing="compact">
    173         <listitem>
    174           <para>
    175             <xref linkend="libva"/>
    176           </para>
    177         </listitem>
    178         <listitem>
    179           <para>
    180             <xref linkend="libvdpau"/>
    181           </para>
    182         </listitem>
    183       </itemizedlist>
    184 
    185     </sect3>
    186 -->
    187 
    188150  </sect2>
    189151
    190   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    191     href="x7driver-glamor.xml"/> -->
    192 
    193   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    194     href="libevdev.xml"/> -->
    195 
    196152  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    197153    href="x7driver-evdev.xml"/>
    … …  
    248204    href="x7driver-vmware.xml"/>
    249205
    250   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    251     href="libva.xml"/>
    252 
    253   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    254     href="libvdpau.xml"/> -->
    255 
    256206</sect1>

  • x/installing/x7lib.xml

    r006e35c r82f15d2  
    6262  <!ENTITY libfontenc-md5sum               "ad2919764933e075bb0361ad5caa3d19">
    6363
    64   <!ENTITY libXfont-version                "1.4.8">
    65   <!ENTITY libXfont-md5sum                 "a7cbc4128c244d9c54fdf21cd517ac8c">
     64  <!ENTITY libXfont-version                "1.5.0">
     65  <!ENTITY libXfont-md5sum                 "664629bfa7cdf8b984155019fd395dcb">
    6666
    6767  <!ENTITY libXft-version                  "2.3.2">
    … …  
    146146      <listitem>
    147147        <para>Estimated build time: &x7libs-time;</para>
    148       </listitem>
    149     </itemizedlist>
    150 
    151     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    152     <itemizedlist spacing="compact">
    153       <listitem>
    154         <para>
    155           Required patch:
    156           <ulink url="&patch-root;/libXfont-&libXfont-version;-fontsproto_fix-1.patch"/>
    157         </para>
    158148      </listitem>
    159149    </itemizedlist>
    … …  
    251241  case $packagedir in
    252242    libXfont-[0-9]* )
    253       patch -Np1 -i ../../libXfont-&libXfont-version;-fontsproto_fix-1.patch &amp;&amp;
    254       sed -i 's/fontsproto &lt; 2.1.3/fontsproto/' configure &amp;&amp;
    255243      ./configure $XORG_CONFIG --disable-devel-docs
    256244    ;;
    … …  
    278266  <sect2 role="commands">
    279267    <title>Command Explanations</title>
    280 
    281     <para><command>sed ... 2.1.3/fontsproto/' configure</command>: Allow
    282     <application>libXfont</application> to compile with
    283     <application>fontsproto</application> currently in BLFS.</para>
    284268
    285269    <para><parameter>--with-fop</parameter>: Use <xref linkend="fop"/> to
Note: See TracChangeset for help on using the changeset viewer.