From deischen@FreeBSD.org  Wed Dec  3 14:07:27 2003
Return-Path: <deischen@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 23AA716A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  3 Dec 2003 14:07:27 -0800 (PST)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 36D5943F93
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  3 Dec 2003 14:07:26 -0800 (PST)
	(envelope-from deischen@FreeBSD.org)
Received: from freefall.freebsd.org (deischen@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hB3M7QFY071653
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 3 Dec 2003 14:07:26 -0800 (PST)
	(envelope-from deischen@freefall.freebsd.org)
Received: (from deischen@localhost)
	by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hB3M7QYx071652;
	Wed, 3 Dec 2003 14:07:26 -0800 (PST)
	(envelope-from deischen)
Message-Id: <200312032207.hB3M7QYx071652@freefall.freebsd.org>
Date: Wed, 3 Dec 2003 14:07:26 -0800 (PST)
From: Daniel Eischen <deischen@freebsd.org>
Reply-To: Daniel Eischen <deischen@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] multimedia/libxine uses static ldt allocation
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         59930
>Category:       ports
>Synopsis:       [PATCH] multimedia/libxine uses static ldt allocation
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    nobutaka
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 03 14:10:17 PST 2003
>Closed-Date:    Tue Dec 09 05:13:02 PST 2003
>Last-Modified:  Tue Dec 09 05:13:02 PST 2003
>Originator:     Daniel Eischen
>Release:        FreeBSD 5.2-BETA
>Organization:
NA
>Environment:
-current i386
>Description:
	libxine uses static ldt allocation and this doesn't work
	with libthr and libkse.
>How-To-Repeat:
	Audit libxine source (src/libw32dll/wine/ldt_keeper.c).
>Fix:
	Add the following patch to multimedia/libxine/files/patch-src:libw32dll:ldt_keeper.c.
	A similar patch was made to multimedia/mplayer.

--- src/libw32dll/wine/ldt_keeper.c.orig	Sat Oct 11 12:22:18 2003
+++ src/libw32dll/wine/ldt_keeper.c	Tue Dec  2 19:49:23 2003
@@ -138,7 +138,7 @@
 #define       TEB_SEL_IDX     1024
 #endif
 
-#define       TEB_SEL LDT_SEL(TEB_SEL_IDX)
+static unsigned int teb_sel = LDT_SEL(TEB_SEL_IDX);
 
 #ifdef __cplusplus
 extern "C"
@@ -146,7 +146,7 @@
 void Setup_FS_Segment(void)
 {
     __asm__ __volatile__(
-	"movl %0,%%eax; movw %%ax, %%fs" : : "i" (TEB_SEL) : "%eax"
+	"movl %0,%%eax; movw %%ax, %%fs" : : "r" (teb_sel) : "%eax"
     );
 }
 
@@ -158,7 +158,7 @@
     );
     fs = fs & 0xffff;
     
-    if( fs != TEB_SEL ) {
+    if( fs != teb_sel ) {
       printf("ldt_keeper: FS segment is not set or has being lost!\n");
       printf("            Please report this error to xine-devel@sourceforge.net\n");
       printf("            Aborting....\n");
@@ -230,7 +230,13 @@
         unsigned long d[2];
 
         LDT_EntryToBytes( d, &array );
+#if defined(__FreeBSD__) && defined(LDT_AUTO_ALLOC)
+        ret = i386_set_ldt(LDT_AUTO_ALLOC, (union descriptor *)d, 1);
+        array.entry_number = ret;
+        teb_sel = LDT_SEL(ret);
+#else
         ret = i386_set_ldt(array.entry_number, (union descriptor *)d, 1);
+#endif
         if (ret < 0)
         {
             perror("install_fs");
@@ -244,7 +250,7 @@
 #if defined(__svr4__)
     {
 	struct ssd ssd;
-	ssd.sel = TEB_SEL;
+	ssd.sel = teb_sel;
 	ssd.bo = array.base_addr;
 	ssd.ls = array.limit - array.base_addr;
 	ssd.acc1 = ((array.read_exec_only == 0) << 1) |


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nobutaka 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Dec 3 14:25:51 PST 2003 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59930 
State-Changed-From-To: open->closed 
State-Changed-By: nobutaka 
State-Changed-When: Tue Dec 9 05:12:24 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59930 
>Unformatted:
