Changeset f8248d7


Ignore:
Timestamp:
03/13/2012 11:09:44 PM (12 years ago)
Author:
Ken Moffat <ken@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
8253f9fc
Parents:
b495000
Message:

pulse: subversion really sucks at conflict resolution, go with Armin making pkgconfig required instead of my recommended.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9690 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • multimedia/libdriv/pulseaudio.xml

    rb495000 rf8248d7  
    6767    <xref linkend="json-c"/>,
    6868    <xref linkend="libsndfile"/>,
    69     <xref linkend="pkgconfig"/> and <!-- required to pick up json-c -->
     69    <xref linkend="pkgconfig"/> and <!-- required to pick up json-c and libsndfile -->
    7070    <xref linkend="speex"/></para>
    7171
    7272    <bridgehead renderas="sect4">Recommended</bridgehead>
    73     <para role="recommended"><xref linkend="dbus"/> and
    74     <xref linkend="pkgconfig"/></para>
     73    <para role="recommended"><xref linkend="dbus"/></para>
    7574
    7675    <bridgehead renderas="sect4">Recommended (If you are going to use it
Note: See TracChangeset for help on using the changeset viewer.