r2956 - in trunk: BOOK BOOK/introduction/welcome BOOK/multimedia/libdriv patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Wed Nov 17 16:31:41 PST 2004


Author: randy
Date: 2004-11-17 17:31:39 -0700 (Wed, 17 Nov 2004)
New Revision: 2956

Added:
   trunk/patches/xine-lib-1-rc7-discover_smb-1.patch
Removed:
   trunk/patches/ffmpeg-0.4.8-gcc34-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/xine-lib.xml
Log:
Updated to xine-libs-1-rc7

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-11-17 15:48:41 UTC (rev 2955)
+++ trunk/BOOK/general.ent	2004-11-18 00:31:39 UTC (rev 2956)
@@ -410,7 +410,7 @@
 <!ENTITY libdv-version                "0.103"> 
 <!ENTITY liba52-version               "0.7.4">    
 <!ENTITY xvid-version                 "1.0.2">  
-<!ENTITY xine-lib-version             "1-rc6a">  
+<!ENTITY xine-lib-version             "1-rc7">  
 <!ENTITY libmikmod-version            "3.1.11"> 
 
 <!-- Chapter 38 --> 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-11-17 15:48:41 UTC (rev 2955)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-11-18 00:31:39 UTC (rev 2956)
@@ -23,7 +23,7 @@
 <itemizedlist>
 
 <listitem><para>November 17th, 2004 [randy]: Updated to
-FFmpeg-0.4.9-pre1.</para></listitem>
+FFmpeg-0.4.9-pre1 and xine-libs-1-rc7.</para></listitem>
 
 <listitem><para>November 17th, 2004 [igor]: Updated to
 libxml2-2.6.16.</para></listitem>

Modified: trunk/BOOK/multimedia/libdriv/xine-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/xine-lib.xml	2004-11-17 15:48:41 UTC (rev 2955)
+++ trunk/BOOK/multimedia/libdriv/xine-lib.xml	2004-11-18 00:31:39 UTC (rev 2956)
@@ -2,12 +2,12 @@
    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
- 
+
   <!ENTITY xine-lib-download-http "http://prdownloads.sourceforge.net/xine/xine-lib-&xine-lib-version;.tar.gz">
   <!ENTITY xine-lib-download-ftp  " ">
-  <!ENTITY xine-lib-size          "6.9 MB">
-  <!ENTITY xine-lib-buildsize     "67 MB">
-  <!ENTITY xine-lib-time          "3.22 SBU">
+  <!ENTITY xine-lib-size          "7.3 MB">
+  <!ENTITY xine-lib-buildsize     "82 MB">
+  <!ENTITY xine-lib-time          "3.44 SBU">
 ]>
 
 <sect1 id="xine-lib" xreflabel="xine Libraries-&xine-lib-version;">
@@ -34,28 +34,44 @@
 <listitem><para>Estimated build time: &xine-lib-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para><ulink 
+url="&patch-root;/xine-lib-&xine-lib-version;-discover_smb-1.patch"/></para>
+</listitem></itemizedlist>
+</sect3>
+
 <sect3><title><application>xine Libraries</application> dependencies</title>
 <sect4><title>Required</title>
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>) and 
 <xref linkend="esound"/> or <acronym>OSS</acronym> or 
 <xref linkend="alsa"/> or <xref linkend="arts"/></para>
 </sect4>
+
 <sect4><title>Optional</title>
 <para><xref linkend="pkgconfig"/>, 
+<xref linkend="ffmpeg"/>, 
 <xref linkend="aalib"/>, 
 <xref linkend="libmng"/>, 
-<xref linkend="gnome-vfs"/>, 
 <xref linkend="SDL"/>, 
-<ulink url="http://www.directfb.org/">DirectFB</ulink>, 
 <xref linkend="flac"/>, 
 <xref linkend="libfame"/>, 
 <xref linkend="libogg"/>, 
 <xref linkend="libvorbis"/>, 
 <xref linkend="speex"/>, 
+<xref linkend="freeglut"/>, 
+<xref linkend="gnome-vfs"/>, 
+<xref linkend="samba3"/>, 
+<ulink url="http://www.directfb.org/">DirectFB</ulink>, 
 <ulink url="http://www.theora.org/">Theora</ulink>, 
-<ulink url="http://www.libstk.org/">LibSTK</ulink> and 
-<ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>
-</para></sect4>
+<ulink url="http://www.audiocoding.com/modules/mydownloads/">FAAD</ulink>, 
+<ulink url="http://www.libstk.org/">LibSTK</ulink>, 
+<ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>, 
+<ulink url="http://sourceforge.net/projects/dvd/">libdvdnav</ulink>, 
+<ulink 
+url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink> 
+and <ulink url="http://www.xfig.org/">Transfig</ulink></para>
+</sect4>
 </sect3>
 
 </sect2>
@@ -66,7 +82,8 @@
 <para>Install <application>xine Libraries</application> by running the 
 following commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr &&
+<screen><userinput><command>patch -Np1 -i ../xine-lib-&xine-lib-version;-discover_smb-1.patch &&
+./configure --prefix=/usr &&
 make &&
 make install</command></userinput></screen>
 
@@ -77,8 +94,9 @@
 
 <para>The <application>xine Libraries</application> package contains 
 <command>xine-config</command>, 
-<filename class="libraryfile">libxine</filename> libraries and 
-various input/output plugins.</para>
+the <filename class="libraryfile">libxine</filename> library, 
+various input/output plugins and fonts used by the output display 
+engine.</para>
 
 </sect2>
 
@@ -90,7 +108,7 @@
 
 <sect3><title>libxine libraries</title>
 <para><filename class="libraryfile">libxine</filename> libraries provide the 
-<acronym>API</acronym> for processing video files.</para></sect3>
+<acronym>API</acronym> for processing audio/video files.</para></sect3>
 
 </sect2>
 

Deleted: trunk/patches/ffmpeg-0.4.8-gcc34-1.patch
===================================================================
--- trunk/patches/ffmpeg-0.4.8-gcc34-1.patch	2004-11-17 15:48:41 UTC (rev 2955)
+++ trunk/patches/ffmpeg-0.4.8-gcc34-1.patch	2004-11-18 00:31:39 UTC (rev 2956)
@@ -1,72 +0,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 2004-04-24
-Initial Package Version: 0.4.8
-Origin: BELFS Project
-Upstream Status: Fixed in CVS
-Description: Fixes Compile Issues with GCC 3.4
- 
-$LastChangedBy$
-$Date$
-
-diff -Naur ffmpeg-0.4.8.orig/libavcodec/i386/dsputil_mmx.c ffmpeg-0.4.8/libavcodec/i386/dsputil_mmx.c
---- ffmpeg-0.4.8.orig/libavcodec/i386/dsputil_mmx.c	2003-09-28 15:26:40.000000000 +0000
-+++ ffmpeg-0.4.8/libavcodec/i386/dsputil_mmx.c	2004-04-24 18:15:55.222028167 +0000
-@@ -25,14 +25,14 @@
- int mm_flags; /* multimedia extension flags */
- 
- /* pixel operations */
--static const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
--static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
--static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
--
--static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
--static const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
--static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
--static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
-+const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
-+const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
-+const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
-+
-+const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
-+const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
-+const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
-+const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
- 
- #define JUMPALIGN() __asm __volatile (".balign 8"::)
- #define MOVQ_ZERO(regd)  __asm __volatile ("pxor %%" #regd ", %%" #regd ::)
-diff -Naur ffmpeg-0.4.8.orig/libavcodec/i386/motion_est_mmx.c ffmpeg-0.4.8/libavcodec/i386/motion_est_mmx.c
---- ffmpeg-0.4.8.orig/libavcodec/i386/motion_est_mmx.c	2003-09-28 15:26:40.000000000 +0000
-+++ ffmpeg-0.4.8/libavcodec/i386/motion_est_mmx.c	2004-04-24 18:15:55.226027527 +0000
-@@ -20,13 +20,13 @@
-  */
- #include "../dsputil.h"
- 
--static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
-+const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
- 0x0000000000000000,
- 0x0001000100010001,
- 0x0002000200020002,
- };
- 
--static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
-+const __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
- 
- static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
- {
-diff -Naur ffmpeg-0.4.8.orig/libavcodec/i386/simple_idct_mmx.c ffmpeg-0.4.8/libavcodec/i386/simple_idct_mmx.c
---- ffmpeg-0.4.8.orig/libavcodec/i386/simple_idct_mmx.c	2003-09-28 15:26:40.000000000 +0000
-+++ ffmpeg-0.4.8/libavcodec/i386/simple_idct_mmx.c	2004-04-24 18:15:55.234026246 +0000
-@@ -45,10 +45,10 @@
- #define ROW_SHIFT 11
- #define COL_SHIFT 20 // 6
- 
--static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
--static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
-+const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
-+const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
- 
--static const int16_t __attribute__((aligned(8))) coeffs[]= {
-+const int16_t __attribute__((aligned(8))) coeffs[]= {
- 	1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
- //	1<<(COL_SHIFT-1), 0, 1<<(COL_SHIFT-1), 0,
- //	0, 1<<(COL_SHIFT-1-16), 0, 1<<(COL_SHIFT-1-16),

Added: trunk/patches/xine-lib-1-rc7-discover_smb-1.patch
===================================================================
--- trunk/patches/xine-lib-1-rc7-discover_smb-1.patch	2004-11-17 15:48:41 UTC (rev 2955)
+++ trunk/patches/xine-lib-1-rc7-discover_smb-1.patch	2004-11-18 00:31:39 UTC (rev 2956)
@@ -0,0 +1,36 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2004-11-17
+Initial Package Version: 1-rc7
+Upstream Status:         To be submitted
+Origin:                  Self created
+Description:             Modifies configure and make scripts to properly
+                         discover the Samba libsmbclient library
+
+$LastChangedBy$
+$Date$
+
+diff -Naur xine-lib-1-rc7-orig/configure xine-lib-1-rc7/configure
+--- xine-lib-1-rc7-orig/configure	2004-11-04 14:50:41.000000000 +0000
++++ xine-lib-1-rc7/configure	2004-11-17 23:29:30.809125160 +0000
+@@ -36496,7 +36496,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsmbclient  $LIBS"
++LIBS="-L/usr/lib/samba -lsmbclient  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+
+diff -Naur xine-lib-1-rc7-orig/src/input/Makefile.in xine-lib-1-rc7/src/input/Makefile.in
+--- xine-lib-1-rc7-orig/src/input/Makefile.in	2004-11-06 02:46:25.000000000 +0000
++++ xine-lib-1-rc7/src/input/Makefile.in	2004-11-17 23:32:37.202789016 +0000
+@@ -430,7 +430,7 @@
+ LIBOBJS = @LIBOBJS@
+ LIBPNG_CONFIG = @LIBPNG_CONFIG@
+ LIBS = @LIBS@
+-LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@
++LIBSMBCLIENT_LIBS = -L/usr/lib/samba @LIBSMBCLIENT_LIBS@
+ LIBSTK_CFLAGS = @LIBSTK_CFLAGS@
+ LIBSTK_LIBS = @LIBSTK_LIBS@
+ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic


Property changes on: trunk/patches/xine-lib-1-rc7-discover_smb-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list