Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml (revision 35bf1ea20df802d3b5c1a49062c0eeb6b8f61d92)
+++ kde/add/add.xml (revision 3a12cb87352d79e2b257f20d27f9a53952422157)
@@ -17,5 +17,5 @@
The Trinity/KDE3 update to BLFS is a work in progress.
- The packages below have not yet been updated.
+ Some of the packages below have not yet been updated.
@@ -29,4 +29,5 @@
+
Index: kde/add/kdeakode.xml
===================================================================
--- kde/add/kdeakode.xml (revision 3a12cb87352d79e2b257f20d27f9a53952422157)
+++ kde/add/kdeakode.xml (revision 3a12cb87352d79e2b257f20d27f9a53952422157)
@@ -0,0 +1,158 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+ $LastChangedBy: bdubbs $
+ $Date: 2011-12-12 18:02:58 -0600 (Mon, 12 Dec 2011) $
+
+
+ Akode-&akode-version;
+
+
+ Akode
+
+
+
+ Introduction to Akode
+
+ In the current version of Kdemultimedia, some
+ of the functionality provided by the package has been moved into a
+ separate project named Akode. In order for
+ Kdemultimedia to provide the removed
+ functionality, you must install the Akode
+ package first.
+
+ User Notes:
+
+
+
+
+
+ Akode-&akode-version;
+
+ Package Information
+
+
+ Download (HTTP):
+
+
+ Download (FTP):
+
+
+ Download MD5 sum: &akode-md5sum;
+
+
+ Download size: &akode-size;
+
+
+ Estimated disk space required: &akode-buildsize;
+
+
+ Estimated build time: &akode-time;
+
+
+
+ Additional Downloads
+
+
+ Required patch (for FFmpeg support):
+
+
+
+ Akode Dependencies
+
+ Optional
+
+
+ ,
+ ,
+ ,
+ ,
+ ,
+ ,
+ (support is experimental),
+ Secret Rabbit
+ Code (a.k.a. libsamplerate), and
+ JACK
+
+
+ Installation of Akode
+
+patch -Np1 -i ../akode-&akode-version;-consolidated_fixes-1.patch &&
+./configure --prefix=$TRINITY_PREFIX --without-ffmpeg &&
+make
+
+ This package does not come with a test suite.
+
+ Now, as the root user:
+
+make install
+
+
+
+
+ Command Explanations
+
+ --without-ffmpeg: This option disables the
+ experimental FFmpeg support in
+ Akode, as the build fails if it is enabled.
+ You can remove this switch to enable
+ the experimental FFmpeg support, however, the
+ functionality of Akode built with
+ FFmpeg support has not been tested by the
+ BLFS editors.
+
+
+
+
+ Contents
+
+
+ Installed Programs
+ Installed Libraries
+ Installed Directories
+
+
+ akode-config and akodeplay
+ libakode.so, libakode_alsa_sink.so, libakode_mpc_decoder.so,
+ libakode_mpeg_decoder.so, libakode_oss_sink.so, and libakode_xiph_decoder.so
+ include/akode
+
+
+
+
+
+
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml (revision 35bf1ea20df802d3b5c1a49062c0eeb6b8f61d92)
+++ kde/add/kdemultimedia.xml (revision 3a12cb87352d79e2b257f20d27f9a53952422157)
@@ -5,21 +5,13 @@
%general-entities;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
]>
-
+
@@ -29,5 +21,5 @@
- Kdemultimedia-&kde-version;
+ Kdemultimedia-&trinity-version;
@@ -44,120 +36,4 @@
aRts.
- In this version of Kdemultimedia, some
- of the functionality provided by the package has been moved into a
- separate project named Akode. In order for
- Kdemultimedia to provide the removed
- functionality, you must install the Akode
- package first. Instructions to install Akode
- follow. If you wish to skip the Akode
- installation, go straight to the
- .
-
- User Notes:
-
-
-
-
-
- Akode-&akode-version;
-
- Package Information
-
-
- Download (HTTP):
-
-
- Download (FTP):
-
-
- Download MD5 sum: &akode-md5sum;
-
-
- Download size: &akode-size;
-
-
- Estimated disk space required: &akode-buildsize;
-
-
- Estimated build time: &akode-time;
-
-
-
- Additional Downloads
-
-
- Required patch (for FFmpeg support):
-
-
-
- Akode Dependencies
-
- Optional
-
-
- ,
- ,
- ,
- ,
- ,
- ,
- (support is experimental),
- Secret Rabbit
- Code (a.k.a. libsamplerate), and
- JACK
-
-
- Installation of Akode
-
-sed -i "s/#include <iostream>/&\n#include <cstdlib>/" \
- akode/lib/auto_sink.cpp &&
-
-sed -i 's@#include "../lib/decoder.h"@&\n#include <cstdlib>@' \
- akode/akodeplay/akodeplay.cpp &&
-
-sed -i "s/<assert.h>/&\n#include <string.h>\n/" \
- akode/lib/player.cpp &&
-
-sed -i "s/<iostream>/&\n#include <string.h>\n/" \
- akode/lib/magic.cpp &&
-
-./configure --prefix=&kde-dir; --without-ffmpeg \
- --disable-debug --disable-dependency-tracking &&
-make
-
- This package does not come with a test suite.
-
- Now, as the root user:
-
-make install
-
-
-
-
- Command Explanations
-
- sed ...: The four sed commands insert headers
- needed by gcc-4.3 and above because the C++ header
- dependencies have been cleaned up.
-
- --without-ffmpeg: This option disables the
- experimental FFmpeg support in
- Akode, as the build fails if it is enabled.
- You can install the patch listed above and remove this switch to enable
- the experimental FFmpeg support, however, the
- functionality of Akode built with
- FFmpeg support has not been tested by the
- BLFS editors. To install the patch, issue the following command before
- beginning the build:
-
-patch -Np1 -i ../akode-&akode-version;-FFmpeg_fixes-1.patch
-
-
-
-
- Resuming the Kdemultimedia Instructions
-
Package Information
@@ -197,38 +73,33 @@
Required
-
+
+
+
Recommended
- ,
- , and
-
-
+
+ ,
+ ,
+ , and
+
+
Optional
- ,
- ,
- ,
- ,
- ,
- ,
- (built with support),
- ,
- Theora,
- TagLib,
- TunePimp
- (requires ),
- , and
-
-
-
-
-
+
+ ,
+ ,
+ ,
+ ,
+ ,
+ (built with support),
+ gstreamer-0.8
+ (later versions are not supported),
+ ,
+ TagLib,
+ TunePimp
+ (requires ),
+ , and
+
+
@@ -239,15 +110,34 @@
Install kdemultimedia with:
-
-
-
-
-./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
- --disable-debug --disable-dependency-tracking &&
+cp -v /usr/share/aclocal/libtool.m4 admin/libtool.m4.in &&
+cp -v /usr/share/libtool/config/ltmain.sh admin/ltmain.sh &&
+sed -i -e "s@/usr/include/tqt@$TRINITY_PREFIX/include/tqt@" \
+ admin/acinclude.m4.in &&
+make -f admin/Makefile.common &&
+
+sed -i -e 's@^gentable_LDADD.*$@& -L$(TRINITY_PREFIX)/lib@' \
+ noatun/library/Makefile.in &&
+
+export LIBRARY_PATH=$TRINITY_PREFIX/lib &&
+
+./configure --prefix=$TRINITY_PREFIX \
+ --with-qt-dir=$QTDIR \
+ --enable-closure \
+ --with-vorbis \
+ --with-alsa \
+ --with-audiofile \
+ --with-flac \
+ --with-akode \
+ --with-cdparanoia \
+ --with-kscd-cdda \
+ --with-lame \
+ --with-xine \
+ --with-theora \
+ --with-extra-includes=$TRINITY_PREFIX/include \
+ --with-extra-libs=$TRINITY_PREFIX/lib:$QTDIR/lib &&
+
make
+
+ Remove and '--with-' statements for those dependencies not installed.