Author: ishikawa
Date: 2003-06-12 01:08:03 -0500 (Thu, 12 Jun 2003)
New Revision: 181
Added:
people/ishikawa/debian/patches/909_debian_piclib_support.diff
people/ishikawa/debian/xlibs-pic.install
people/ishikawa/debian/xlibs-pic.install.netbsd-i386
Modified:
people/ishikawa/debian/control
Log:
import debian/patches/046_piclib_support.diff (renumbering to 909) from
trunk/debian
import debian/xlibs-pic.install and debian/xlibs-pic.install.netbsd-i386 fro
from trunk/debian
add xlibs-pic package entry to debian/control
Juts imported, not tested yet.
Added: people/ishikawa/debian/xlibs-pic.install
==============================================================================
--- people/ishikawa/debian/xlibs-pic.install 2003-06-12 05:41:25 UTC (rev
180)
+++ people/ishikawa/debian/xlibs-pic.install 2003-06-12 06:08:03 UTC (rev
181)
@@ -0,0 +1,7 @@
+usr/X11R6/lib/libI810XvMC_pic.a
+usr/X11R6/lib/libXinerama_pic.a
+usr/X11R6/lib/libXvMC_pic.a
+usr/X11R6/lib/libXv_pic.a
+usr/X11R6/lib/libXxf86dga_pic.a
+usr/X11R6/lib/libXxf86vm_pic.a
+usr/X11R6/lib/libxkbfile_pic.a
Added: people/ishikawa/debian/patches/909_debian_piclib_support.diff
==============================================================================
--- people/ishikawa/debian/patches/909_debian_piclib_support.diff
2003-06-12 05:41:25 UTC (rev 180)
+++ people/ishikawa/debian/patches/909_debian_piclib_support.diff
2003-06-12 06:08:03 UTC (rev 181)
@@ -0,0 +1,244 @@
+This patch by Matthieu Herrb, Branden Robinson, ISHIKAWA Mutsumi, and
+LaMont Jones.
+
+Submitted as #5381. Apparently rejected. Edited since then to PICify
+Xinerama and libxkbfile as well.
+
+--- xc/config/cf/Imake.rules~ Sat Oct 27 05:56:26 2001
++++ xc/config/cf/Imake.rules Tue Oct 30 13:15:49 2001
+@@ -2579,6 +2579,20 @@
+
+
+ /*
++ * Rule to build libXXX_pic.a from PIC objects for a library
++ */
++#ifndef PicLibraryTarget
++#define PicLibraryTarget(libname,objlist)
@@\
++AllTarget(LibraryTargetNameSuffix(libname,_pic)) @@\
++ @@\
++LibraryTargetNameSuffix(libname,_pic): objlist $(EXTRALIBRARYDEPS) @@\
++ RemoveFile($@) @@\
++ MakeLibrary($@,objlist) @@\
++ RanLibrary($@) @@\
++ _LinkBuildLibrary($@)
++#endif /* PicLibraryTarget */
++
++/*
+ * SubdirLibraryRule -
+ */
+ #ifndef SubdirLibraryRule
+--- xc/lib/Xinerama/Imakefile~ 2003-02-23 20:50:38.000000000 -0500
++++ xc/lib/Xinerama/Imakefile 2003-02-23 20:50:56.000000000 -0500
+@@ -4,6 +4,7 @@
+ #define DoSharedLib SharedLibXinerama
+ #define DoDebugLib DebugLibXinerama
+ #define DoProfileLib ProfileLibXinerama
++#define DoPicLib PicLibXinerama
+ #define LibName Xinerama
+ #define SoRev SOXINERAMAREV
+ #define LibHeaders NO
+--- xc/lib/Xv/Imakefile~ Tue Oct 30 13:21:16 2001
++++ xc/lib/Xv/Imakefile Tue Oct 30 13:21:41 2001
+@@ -4,6 +4,7 @@
+ #define DoSharedLib SharedLibXv
+ #define DoDebugLib DebugLibXv
+ #define DoProfileLib ProfileLibXv
++#define DoPicLib PicLibXv
+ #define LibName Xv
+ #define SoRev SOXVREV
+ #define LibHeaders NO
+--- xc/lib/XvMC/Imakefile~ Wed Jun 12 01:04:05 2002
++++ xc/lib/XvMC/Imakefile Wed Jun 12 01:04:23 2002
+@@ -4,6 +4,7 @@
+ #define DoSharedLib SharedLibXvMC
+ #define DoDebugLib DebugLibXvMC
+ #define DoProfileLib ProfileLibXvMC
++#define DoPicLib PicLibXvMC
+ #define LibName XvMC
+ #define SoRev SOXVMCREV
+ #define LibHeaders NO
+--- xc/lib/XvMC/hw/i810/Imakefile~ Wed Jun 12 01:04:35 2002
++++ xc/lib/XvMC/hw/i810/Imakefile Wed Jun 12 01:04:47 2002
+@@ -3,6 +3,7 @@
+ #define DoSharedLib SharedLibXvMC
+ #define DoDebugLib DebugLibXvMC
+ #define DoProfileLib ProfileLibXvMC
++#define DoPicLib PicLibXvMC
+ #define LibName I810XvMC
+ #define SoRev SOXVMCREV
+ #define LibHeaders NO
+--- xc/lib/Xxf86dga/Imakefile~ Tue Oct 30 13:20:50 2001
++++ xc/lib/Xxf86dga/Imakefile Tue Oct 30 13:21:06 2001
+@@ -4,6 +4,7 @@
+ #define DoExtraLib SharedLibXxf86dga
+ #define DoDebugLib DebugLibXxf86dga
+ #define DoProfileLib ProfileLibXxf86dga
++#define DoPicLib PicLibXxf86dga
+ #define LibName Xxf86dga
+ #define SoRev SOXXF86DGAREV
+ #define LibHeaders NO
+--- xc/lib/Xxf86vm/Imakefile~ Tue Oct 30 13:21:47 2001
++++ xc/lib/Xxf86vm/Imakefile Tue Oct 30 13:21:58 2001
+@@ -4,6 +4,7 @@
+ #define DoExtraLib SharedLibXxf86vm
+ #define DoDebugLib DebugLibXxf86vm
+ #define DoProfileLib ProfileLibXxf86vm
++#define DoPicLib PicLibXxf86vm
+ #define LibName Xxf86vm
+ #define SoRev SOXXF86VMREV
+ #define LibHeaders NO
+--- xc/lib/xkbfile/Imakefile~ 2003-05-22 16:07:17.000000000 -0600
++++ xc/lib/xkbfile/Imakefile 2003-05-22 16:09:21.000000000 -0600
+@@ -10,6 +10,7 @@
+ #define DoExtraLib NO
+ #define DoDebugLib NO
+ #define DoProfileLib NO
++#define DoPicLib YES
+ #define HasSharedData NO
+ #define LibName xkbfile
+ #define SoRev SOXKBFILEREV
+--- xc/config/cf/X11.tmpl.orig 2003-02-23 20:56:56.000000000 -0500
++++ xc/config/cf/X11.tmpl 2003-02-23 20:56:58.000000000 -0500
+@@ -1646,6 +1646,9 @@
+ #ifndef ProfileLibXxf86vm
+ #define ProfileLibXxf86vm NO
+ #endif
++#ifndef PicLibXxf86vm
++#define PicLibXxf86vm YES
++#endif
+ #endif
+
+ #if BuildXF86DGALibrary
+@@ -1661,6 +1664,9 @@
+ #ifndef ProfileLibXxf86dga
+ #define ProfileLibXxf86dga NO
+ #endif
++#ifndef PicLibXxf86dga
++#define PicLibXxf86dga YES
++#endif
+ #endif
+
+ #if BuildXF86RushLibrary
+@@ -1691,6 +1697,9 @@
+ #ifndef ProfileLibXv
+ #define ProfileLibXv NO
+ #endif
++#ifndef PicLibXv
++#define PicLibXv YES
++#endif
+ #endif
+
+ #if BuildXvMCLibrary
+@@ -1706,6 +1715,9 @@
+ #ifndef ProfileLibXvMC
+ #define ProfileLibXvMC NO
+ #endif
++#ifndef PicLibXvMC
++#define PicLibXvMC YES
++#endif
+ #endif
+
+ #if BuildXineramaLibrary
+@@ -1721,6 +1733,9 @@
+ #ifndef ProfileLibXinerama
+ #define ProfileLibXinerama NO
+ #endif
++#ifndef PicLibXinerama
++#define PicLibXinerama YES
++#endif
+ #endif
+
+
+--- xc/config/cf/Library.tmpl~ 2003-02-18 21:41:20.000000000 -0500
++++ xc/config/cf/Library.tmpl 2003-02-18 21:42:00.000000000 -0500
+@@ -3,7 +3,7 @@
+ * that Imakefiles in the various library subtrees will need.
+ *
+ * Before including this, you must set the following boolean variables:
+- * DoNormalLib, DoSharedLib, DoDebugLib, DoProfileLib
++ * DoNormalLib, DoSharedLib, DoDebugLib, DoProfileLib, DoPicLib
+ *
+ * To get automatic generation of standard rules, also set the variables:
+ * LibName, SoRev, HasSharedData, and optionally HugeLibrary and IncSubdir.
+@@ -21,8 +21,15 @@
+
+ XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.15 2001/08/27 17:40:55 dawes
Exp $
+
++/*
++ * Some libraries may not define DoPicLib
++ */
++#ifndef DoPicLib
++# define DoPicLib NO
++#endif
++
+ #ifndef LibraryCplusplusOptions
+-# if DoSharedLib && defined(SharedLibraryCplusplusOptions)
++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions)
+ # define LibraryCplusplusOptions SharedLibraryCplusplusOptions
+ # else
+ # define LibraryCplusplusOptions DefaultCplusplusOptions
+@@ -48,14 +55,14 @@
+
+ #ifndef CplusplusSource
+ # ifndef LibraryCcCmd
+-# if DoSharedLib && defined(SharedLibraryCcCmd)
++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCcCmd)
+ # define LibraryCcCmd SharedLibraryCcCmd
+ # else
+ # define LibraryCcCmd CcCmd
+ # endif
+ # endif
+ # ifndef LibraryCCOptions
+-# if DoSharedLib && defined(SharedLibraryCCOptions)
++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCCOptions)
+ # define LibraryCCOptions SharedLibraryCCOptions
+ # else
+ # define LibraryCCOptions DefaultCCOptions
+@@ -73,14 +80,14 @@
+ # endif
+ #else
+ # ifndef LibraryCplusplusCmd
+-# if DoSharedLib && defined(SharedLibraryCplusplusCmd)
++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusCmd)
+ # define LibraryCplusplusCmd SharedLibraryCplusplusCmd
+ # else
+ # define LibraryCplusplusCmd CplusplusCmd
+ # endif
+ # endif
+ # ifndef LibraryCplusplusOptions
+-# if DoSharedLib && defined(SharedLibraryCplusplusOptions)
++# if (DoSharedLib || DoPicLib) && defined(SharedLibraryCplusplusOptions)
+ # define LibraryCplusplusOptions SharedLibraryCplusplusOptions
+ # else
+ # define LibraryCplusplusOptions DefaultCplusplusOptions
+@@ -140,7 +147,7 @@
+ # define _NormalObjCplusplusCompile(options) $(_NULLCMD_)
+ # define _NormalCleanDir() $(_NULLCMD_)
+ #else
+-# if DoSharedLib && SeparateSharedCompile
++# if (DoSharedLib || DoPicLib) && SeparateSharedCompile
+ # define _NormalLibMkdir() _LibMkdir(unshared)
+ # define _NormalObjCompile(options) UnsharedLibObjCompile(options)
+ # define _NormalObjCplusplusCompile(options)
UnsharedLibObjCplusplusCompile(options)
+@@ -153,7 +160,7 @@
+ # endif
+ #endif
+
+-#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile)
++#if !DoSharedLib && !DoPicLib || (DoNormalLib && !SeparateSharedCompile)
+ # define _SharedObjCompile(options) $(_NULLCMD_)
+ # define _SharedObjCplusplusCompile(options) $(_NULLCMD_)
+ #else
+@@ -439,6 +446,12 @@
+ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
+ # endif
+ # endif
++# if DoPicLib
++PicLibraryTarget($(LIBNAME),$(OBJS))
++# if !defined(LibInstall) || LibInstall
++InstallLibrary($(LIBNAME)_pic,$(USRLIBDIR))
++# endif
++# endif
+ # if DoExtraLib && defined(ExtraLibRules)
+ ExtraLibraryTarget($(LIBNAME),$(SoRev),$(OBJS) $(EXTRAUNSHAREDOBJS))
+ # if !defined(LibInstall) || LibInstall
Modified: people/ishikawa/debian/control
==============================================================================
--- people/ishikawa/debian/control 2003-06-12 05:41:25 UTC (rev 180)
+++ people/ishikawa/debian/control 2003-06-12 06:08:03 UTC (rev 181)
@@ -826,6 +826,26 @@
and pixmap image files commonly used by X clients, including a set of cursor
themes.
+Package: xlibs-pic
+Section: devel
+Architecture: any
+Depends: xlibs (= ${Source-Version}), libc6-dev
+Description: X Window System client extension library PIC archives
+ xlibs-pic provides PIC archives (static libraries with PIC information) of
+ some of the libraries in xlibs-dev that are available in xlibs-dev as static
+ objects.
+ .
+ These archives are available for use *only* for linking into objects which
+ will be accessed using the dlopen() function, such as plugin modules for
+ applications.
+ .
+ The libraries available in PIC archive form include:
+ - libI810XvMC
+ - libXv
+ - libXvMC
+ - libXxf86dga
+ - libXxf86vm
+
Package: xmh
Priority: extra
Section: mail
Added: people/ishikawa/debian/xlibs-pic.install.netbsd-i386
==============================================================================
--- people/ishikawa/debian/xlibs-pic.install.netbsd-i386 2003-06-12
05:41:25 UTC (rev 180)
+++ people/ishikawa/debian/xlibs-pic.install.netbsd-i386 2003-06-12
06:08:03 UTC (rev 181)
@@ -0,0 +1,6 @@
+usr/X11R6/lib/libXinerama_pic.a
+usr/X11R6/lib/libXvMC_pic.a
+usr/X11R6/lib/libXv_pic.a
+usr/X11R6/lib/libXxf86dga_pic.a
+usr/X11R6/lib/libXxf86vm_pic.a
+usr/X11R6/lib/libxkbfile_pic.a
