>Number:         36288
>Category:       pkg
>Synopsis:       Teachine xine-lib theora
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon May 07 20:15:00 +0000 2007
>Originator:     Rhialto
>Release:        NetBSD 3.0
>Organization:
	
>Environment:
	
	
System: NetBSD radl.falu.nl 3.0 NetBSD 3.0 (Radl's Pervasion of the Incorrect Chord) #2: Sun Nov 26 21:46:18 CET 2006 root@radl.falu.nl:/usr/src/sys/arch/amd64/compile/RADL amd64
Architecture: x86_64
Machine: amd64
>Description:
	xine-libs can support theora, if configure finds it.

>How-To-Repeat:
	inspection.
>Fix:

	The patch-za file is a workaround (not fix, I think) for the issue I
	just reported on pkgsrc-users:
	http://mail-index.netbsd.org/pkgsrc-users/2007/05/07/0008.html


? patches/patch-za
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/xine-lib/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- Makefile	9 Mar 2007 15:14:16 -0000	1.51
+++ Makefile	7 May 2007 19:55:07 -0000
@@ -40,6 +40,7 @@
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../sysutils/vcdimager-devel/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
Index: PLIST.common
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/xine-lib/PLIST.common,v
retrieving revision 1.18
diff -u -r1.18 PLIST.common
--- PLIST.common	7 Feb 2007 20:04:00 -0000	1.18
+++ PLIST.common	7 May 2007 19:55:07 -0000
@@ -102,6 +102,8 @@
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_spudvb.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_sputext.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_sputext.so
+lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_theora.a
+lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_theora.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_vorbis.a
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_vorbis.so
 lib/xine/plugins/${XINE_LIB_VER}/xineplug_decode_yuv.a
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/xine-lib/distinfo,v
retrieving revision 1.45
diff -u -r1.45 distinfo
--- distinfo	9 Mar 2007 15:14:16 -0000	1.45
+++ distinfo	7 May 2007 19:55:07 -0000
@@ -31,3 +31,4 @@
 SHA1 (patch-dc) = 11c4212029e67f22796e57706b42400a0dbcac3a
 SHA1 (patch-eb) = b65e2c7c30fc04115d55da1ce1f6f65216ac1d23
 SHA1 (patch-ee) = 49efc9d722f2141e88106d87414586ab80e4f5a9
+SHA1 (patch-za) = 444d2fd05bb198bae0a3eacc04040c1a530c3a82


--- cabac.h.orig	2007-01-28 19:38:33.000000000 +0100
+++ cabac.h	2007-05-07 21:18:14.000000000 +0200
@@ -376,7 +376,7 @@
 #define BYTE        "16"
 #define BYTEEND     "20"
 #endif
-#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__))
+#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) && !defined(ARCH_X86_64)
     int bit;
 
 #ifndef BRANCHLESS_CABAC_DECODER
@@ -680,7 +680,7 @@
 
 //FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!)
 //FIXME use some macros to avoid duplicatin get_cabac (cant be done yet as that would make optimization work hard)
-#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__))
+#if defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) && !defined(ARCH_X86_64)
 static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
     void *end= significant_coeff_ctx_base + max_coeff - 1;
     int minusstart= -(int)significant_coeff_ctx_base;

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert      -- You author it, and I'll reader it.
\X/ rhialto/at/xs4all.nl        -- Cetero censeo "authored" delendum esse.

>Unformatted: