# ChangeLog for media-libs/xine-lib
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.153 2004/10/21 06:22:42 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.154 2004/11/09 04:18:07 chriswhite Exp $
+
+*xine-lib-1_rc7 (09 Nov 2004)
+
+ 09 Nov 2004; Chris White <chriswhite@gentoo.org>
+ +files/xine-lib-1_rc7-2.6.patch,
+ +files/xine-lib-1_rc7-configure-sparc.patch,
+ +files/xine-lib-1_rc7-mmx.patch, +files/xine-lib-1_rc7-pic.patch,
+ +xine-lib-1_rc7.ebuild:
+ Bumped to version 1_rc7. Took out the CFLAGS protection as xine-lib uses
+ custom CFLAGS now. Transitioned patches to new _rc7 format and tested to
+ verify application.
20 Oct 2004; Luca Barbato <lu_zero@gentoo.org> xine-lib-1_rc6.ebuild:
Made sure the ppc workaround is applied on ppc64 too
-MD5 8b65a99d62d7bf832667db8c7a4ee9a3 ChangeLog 26169
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7408bbe92cfccf8c31f236044eb6a765 ChangeLog 26600
MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
MD5 8c7e82dd9fa241e2eac1fb211a0c1811 xine-lib-1_rc5-r3.ebuild 5462
MD5 61081f9e2ad4c0c2b87487d2a7b7d945 xine-lib-1_rc6.ebuild 5347
-MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
+MD5 6c2785e3126dc5bfcd59ce13aeb84d48 xine-lib-1_rc7.ebuild 5252
+MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
+MD5 98e135f240fada719668b012c77b40be files/digest-xine-lib-1_rc7 67
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
+MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
-MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
+MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68
MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBkEUXFdQwWVoAgN4RAv80AJ9A7EgYEy8ifvx8PlPymwLcWYIWqgCglb+o
+I9bgwWzRDbzh4emQ8xM4BYo=
+=bfO9
+-----END PGP SIGNATURE-----
--- /dev/null
+MD5 b3eaa0dd44fdbb8e3915399895c8414a xine-lib-1-rc7.tar.gz 7303130
--- /dev/null
+--- src/xine-utils/xine_check.c 2003-12-08 10:36:27.000000000 +0000
++++ src/xine-utils/xine_check.c.plasmaroo 2003-12-27 14:20:36.000000000 +0000
+@@ -276,6 +276,11 @@
+ return hc;
+ }
+
++ #define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
++ ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR))
++
++ #define SCSI_BLK_MAJOR(M) (SCSI_DISK_MAJOR(M) || (M) == SCSI_CDROM_MAJOR)
++
+ if (SCSI_BLK_MAJOR(major(st.st_rdev))) {
+ is_scsi_dev = 1;
+ set_hc_result(hc, XINE_HEALTH_CHECK_OK, "SKIPPED - Operation not supported on SCSI drives or drives that use the ide-scsi module.");
--- /dev/null
+--- xine-lib-1-rc3/configure.ac.org 2003-12-29 14:44:22.000000000 +0100
++++ xine-lib-1-rc3/configure.ac 2003-12-29 14:47:43.000000000 +0100
+@@ -1505,9 +1505,9 @@
+ ;;
+
+ sparc*-*-linux*)
+- case $host_alias in
+- sparc-*) cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
+- sparc64-*)
++ case `uname -m` in
++ sparc) cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
++ sparc64)
+ cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc"
+ if test x$enable_vis = xyes; then
+ AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
--- /dev/null
+--- configure.old 2004-10-21 04:50:30.189310168 +0900
++++ configure 2004-10-21 04:51:02.455404976 +0900
+@@ -41676,7 +41676,7 @@
+
+
+ enable_w32dll="yes"
+- enable_ffmmx="yes"
++ enable_ffmmx="no"
+ no_fpic="yes"
+ ;;
+
+@@ -41995,7 +41995,7 @@
+ #define FPM_INTEL 1
+ _ACEOF
+
+- enable_ffmmx="yes"
++ enable_ffmmx="no"
+ enable_w32dll="yes"
+
+ case "$host_or_hostalias" in
--- /dev/null
+diff -ur src.orig/libffmpeg/libavcodec/i386/dsputil_mmx.c src/libffmpeg/libavcodec/i386/dsputil_mmx.c
+--- src.orig/libffmpeg/libavcodec/i386/dsputil_mmx.c 2004-10-17 12:17:07.406331880 +0200
++++ src/libffmpeg/libavcodec/i386/dsputil_mmx.c 2004-10-17 12:17:57.600701176 +0200
+@@ -56,7 +56,7 @@
+ "pcmpeqd %%" #regd ", %%" #regd " \n\t"\
+ "paddb %%" #regd ", %%" #regd " \n\t" ::)
+
+-#ifndef PIC
++#ifndef __PIC__
+ #define MOVQ_BONE(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_bone))
+ #define MOVQ_WTWO(regd) __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo))
+ #else
+diff -ur src.orig/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h
+--- src.orig/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h 2004-10-17 12:17:07.405332032 +0200
++++ src/libffmpeg/libavcodec/i386/dsputil_mmx_rnd.h 2004-10-17 12:17:52.989402200 +0200
+@@ -96,7 +96,7 @@
+ "addl %5, %3 \n\t"
+ "subl $4, %0 \n\t"
+ "jnz 1b \n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+@@ -191,7 +191,7 @@
+ "addl $32, %2 \n\t"
+ "subl $2, %0 \n\t"
+ "jnz 1b \n\t"
+-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
++#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+ :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+ #else
+ :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
+diff -ur src.orig/libffmpeg/libavcodec/msmpeg4.c src/libffmpeg/libavcodec/msmpeg4.c
+--- src.orig/libffmpeg/libavcodec/msmpeg4.c 2004-10-17 12:17:07.419329904 +0200
++++ src/libffmpeg/libavcodec/msmpeg4.c 2004-10-17 12:18:06.573337128 +0200
+@@ -837,7 +837,7 @@
+ necessitate to modify mpegvideo.c. The problem comes from the
+ fact they decided to store the quantized DC (which would lead
+ to problems if Q could vary !) */
+-#if defined ARCH_X86 && !defined PIC
++#if defined ARCH_X86 && !defined __PIC__
+ asm volatile(
+ "movl %3, %%eax \n\t"
+ "shrl $1, %%eax \n\t"
+diff -ur src.orig/xine-utils/cpu_accel.c src/xine-utils/cpu_accel.c
+--- src.orig/xine-utils/cpu_accel.c 2004-10-17 12:17:07.577305888 +0200
++++ src/xine-utils/cpu_accel.c 2004-10-17 12:18:14.393148336 +0200
+@@ -63,7 +63,7 @@
+ int AMD;
+
+ caps = 0;
+-#ifndef PIC
++#ifndef __PIC__
+ #define cpuid(op,eax,ebx,ecx,edx) \
+ __asm__ ("cpuid" \
+ : "=a" (eax), \
--- /dev/null
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc7.ebuild,v 1.1 2004/11/09 04:18:07 chriswhite Exp $
+
+inherit eutils flag-o-matic gcc libtool
+
+# This should normally be empty string, unless a release has a suffix.
+MY_PKG_SUFFIX=""
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec"
+
+RDEPEND="oggvorbis? ( media-libs/libvorbis )
+ !amd64? ( X? ( virtual/x11 ) )
+ amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
+ avi? ( x86? ( >=media-libs/win32codecs-0.50 ) )
+ esd? ( media-sound/esound )
+ dvd? ( >=media-libs/libdvdcss-1.2.7 )
+ arts? ( kde-base/arts )
+ alsa? ( media-libs/alsa-lib )
+ aalib? ( media-libs/aalib )
+ directfb? ( >=dev-libs/DirectFB-0.9.9 dev-util/pkgconfig )
+ gnome? ( >=gnome-base/gnome-vfs-2.0
+ dev-util/pkgconfig )
+ >=media-libs/flac-1.0.4
+ sdl? ( >=media-libs/libsdl-1.1.5 )
+ >=media-libs/libfame-0.9.0
+ theora? ( media-libs/libtheora )
+ speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
+
+pkg_setup() {
+ # Make sure that the older libraries are not installed (bug #15081).
+ if [ `has_version =media-libs/xine-lib-0.9.13*` ]
+ then
+ eerror "Please uninstall older xine libraries.";
+ eerror "The compilation cannot proceed.";
+ die
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # plasmaroo: Kernel 2.6 headers patch
+ epatch ${FILESDIR}/${P}-2.6.patch
+
+ # force 32 bit userland
+ [ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch
+
+ elibtoolize #40317
+
+ # Fix building on amd64, #49569
+ #use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
+
+ epatch ${FILESDIR}/${P}-pic.patch
+ use pic && epatch ${FILESDIR}/${P}-mmx.patch
+
+ # Fix detection of hppa2.0 and hppa1.1 CHOST
+ use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
+}
+
+src_compile() {
+ filter-flags -maltivec -mabi=altivec
+ filter-flags -fforce-addr
+ filter-flags -momit-leaf-frame-pointer #46339
+ filter-flags -funroll-all-loops #55420
+
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+ append-flags -fno-web #49509
+ filter-flags -fno-unit-at-a-time #55202
+ append-flags -funit-at-a-time #55202
+ fi
+
+ is-flag -O? || append-flags -O1 #31243
+
+ # fix build errors with sse2 #49482
+ if use x86 ; then
+ if [ `gcc-major-version` -eq 3 ] ; then
+ append-flags -mno-sse2 `test_flag -mno-sse3`
+ filter-mfpmath sse
+ fi
+ fi
+
+ # Use the built-in dvdnav plugin.
+ local myconf="--with-included-dvdnav"
+
+ # the win32 codec path should ignore $(get_libdir) and always use lib
+ use avi && use x86 \
+ && myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
+ || myconf="${myconf} --disable-asf"
+
+ use sparc \
+ && myconf="${myconf} --build=${CHOST}"
+
+ # enable/disable appropiate optimizations on sparc
+ [ "${PROFILE_ARCH}" == "sparc64" ] \
+ && myconf="${myconf} --enable-vis"
+ [ "${PROFILE_ARCH}" == "sparc" ] \
+ && myconf="${myconf} --disable-vis"
+
+ use amd64 \
+ && myconf="${myconf} --with-xv-path=/usr/X11R6/$(get_libdir)"
+
+ # Fix compilation-errors on PowerPC #45393 & #55460 & #68251
+ if use ppc || use ppc64 ; then
+ append-flags -U__ALTIVEC__
+ myconf="${myconf} `use_enable altivec`"
+ fi
+
+ # The default CFLAGS (-O) is the only thing working on hppa.
+ if use hppa && [ "`gcc-version`" != "3.4" ] ; then
+ unset CFLAGS
+ else
+ append-flags -ffunction-sections
+ fi
+
+ # if lib64 is a directory, sometimes the configure will set libdir itself
+ # and the installation fails. see bug #62339
+ myconf="${myconf} --libdir=/usr/$(get_libdir)"
+
+ econf \
+ $(use_enable X x11) \
+ $(use_with X x) \
+ $(use_enable X shm) \
+ $(use_enable X xft) \
+ $(use_enable esd) \
+ $(use_enable nls) \
+ $(use_enable alsa) \
+ $(use_enable arts) \
+ $(use_enable aalib) \
+ $(use_enable oggvorbis ogg) \
+ $(use_enable oggvorbis vorbis) \
+ $(use_enable sdl sdltest) \
+ $(use_enable ipv6) \
+ $(use_enable directfb) \
+ ${myconf} || die "Configure failed"
+
+ emake -j1 || die "Parallel make failed"
+}
+
+src_install() {
+ # portage 2.0.50's einstall is broken for handling libdir
+ make DESTDIR=${D} install || die "Install failed"
+
+ # Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
+ dodir /usr/share/xine/libxine1/fonts
+ mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
+
+ dodoc AUTHORS ChangeLog INSTALL README TODO
+ cd ${S}/doc
+ dodoc dataflow.dia README*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Please note, a new version of xine-lib has been installed."
+ einfo "For library consistency, you need to unmerge old versions"
+ einfo "of xine-lib before merging xine-ui."
+ einfo
+ einfo "This library version 1 is incompatible with the plugins"
+ einfo "designed for the prior library versions such as xine-d4d,"
+ einfo "xine-d5d, xine-dmd, and xine-dvdnav."
+ einfo
+ einfo "Also, make sure to remove your ~/.xine if upgrading from"
+ einfo "a previous version."
+ einfo
+}
projects / gentoo.git / commitdiff