| 1 |
xarthisius 10/07/01 19:52:42 |
| 2 |
|
| 3 |
Added: 2.80.1-gentoo.patch 2.80.1-implicit_funcs.patch |
| 4 |
Log: |
| 5 |
Fix building with as-needed wrt bug 247919, debundle libquicktime, respect FLAGS, fix implicit function declarations. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/xanim-export/files/2.80.1-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/xanim-export/files/2.80.1-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/xanim-export/files/2.80.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 2.80.1-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
Fixing as-needed issues, debundling libquicktime, respect FLAGS |
| 17 |
|
| 18 |
http://bugs.gentoo.org/show_bug.cgi?id=247919 |
| 19 |
|
| 20 |
--- Makefile |
| 21 |
+++ Makefile |
| 22 |
@@ -72,9 +72,6 @@ |
| 23 |
# a setup problem on my SunOS machine. Under Solaris, gcc worked |
| 24 |
# fine. |
| 25 |
# |
| 26 |
-# CC = cc |
| 27 |
- CC = gcc |
| 28 |
-#CC = egcs |
| 29 |
# |
| 30 |
######### OPTIMIZATION FLAGS |
| 31 |
# -- Specifiy Any compiler Optimization flags that you wish to use. This |
| 32 |
@@ -116,7 +113,7 @@ |
| 33 |
# to link against symbols inside xanim. |
| 34 |
# |
| 35 |
### Linux |
| 36 |
-LD_FLAGS = -rdynamic |
| 37 |
+LD_FLAGS = $(LDFLAGS) -rdynamic |
| 38 |
### SunOS/Solaris use: |
| 39 |
# LD_FLAGS = |
| 40 |
|
| 41 |
@@ -133,7 +130,7 @@ |
| 42 |
# |
| 43 |
XA_DLL_DEF = -DXA_DLL -DXA_PRINT |
| 44 |
#### Use this only if the above doesn't work. |
| 45 |
-XA_DLL_DEF = -DXA_DLL |
| 46 |
+#XA_DLL_DEF = -DXA_DLL |
| 47 |
# |
| 48 |
#### You may need this library. |
| 49 |
XA_DLL_LIB = -ldl |
| 50 |
@@ -141,7 +138,7 @@ |
| 51 |
# If you'd like to change the default directory that XAnim searches while |
| 52 |
# looking for dlls, then change the directory below. |
| 53 |
# |
| 54 |
-XA_DLL_PATH = /usr/local/xanim/mods |
| 55 |
+XA_DLL_PATH = /usr/lib/xanim/mods-export |
| 56 |
|
| 57 |
|
| 58 |
########################################################################## |
| 59 |
@@ -208,9 +205,9 @@ |
| 60 |
# XA_CVID_DEF = -DXA_CVID |
| 61 |
# XA_CYUV_DEF = -DXA_CYUV |
| 62 |
# |
| 63 |
-#XA_IV32_LIB = mods/xa2.0_iv32_linuxELF.o |
| 64 |
-#XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o |
| 65 |
-#XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o |
| 66 |
+XA_IV32_LIB = mods/xa2.1_iv32_linuxELFg21.o |
| 67 |
+XA_CVID_LIB = mods/xa2.0_cvid_linuxELFg21.o |
| 68 |
+XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELFg21.o |
| 69 |
# |
| 70 |
########################### |
| 71 |
# NOTE: SGI Machines Only: |
| 72 |
@@ -297,16 +294,16 @@ |
| 73 |
# XLIBDIR = -L/usr/openwin/lib |
| 74 |
# |
| 75 |
###-- Linux using X11R6 |
| 76 |
-INCLUDE = -I/usr/X11R6/include -I/usr/X11R6/include/X11 |
| 77 |
-XLIBDIR = -L/usr/X11R6/lib |
| 78 |
+INCLUDE = -I/usr/include -I/usr/include/X11 |
| 79 |
+XLIBDIR = -L/usr/lib |
| 80 |
# |
| 81 |
###-- My SunOS machine running X11R5 |
| 82 |
# INCLUDE = -I/usr/X11R5/include -I/usr/X11R5/include/X11 |
| 83 |
# XLIBDIR = -L/usr/X11R5/lib -lnsl |
| 84 |
# |
| 85 |
###-- My SunOS machine running X11R6 |
| 86 |
-# INCLUDE = -I/usr/X11R6/include -I/usr/X11R6/include/X11 |
| 87 |
-# XLIBDIR = -L/usr/X11R6/lib -lnsl |
| 88 |
+# INCLUDE = -I/usr/include -I/usr/include/X11 |
| 89 |
+# XLIBDIR = -L/usr/lib -lnsl |
| 90 |
# |
| 91 |
###-- Win32 |
| 92 |
#-- This depends on where you installed the Cygnus X11 includes and libs. |
| 93 |
@@ -534,8 +531,8 @@ |
| 94 |
# |
| 95 |
|
| 96 |
XA_DEFS = $(XA_MISC_DEFS) $(XA_MOD_DEFS) $(XA_AUDIO_DEFS) -DXA_PETUNIA -DXA_KPCD -DXA_EXPORT -DXA_EXPORT_QT |
| 97 |
-XA_LIBS = $(XA_X11R6_LIBS) $(XA_MACH_LIBS) $(XA_MOD_LIBS) $(XA_AUDIO_LIBS) -lpthread quicktime/quicktime/libquicktime.a -ljpeg -lpng -lz |
| 98 |
-XA_INCS = $(INCLUDE) $(XA_VIDEO_INCS) $(XA_AUDIO_INCS) -Iquicktime/quicktime |
| 99 |
+XA_LIBS = $(XA_X11R6_LIBS) $(XA_MACH_LIBS) $(XA_MOD_LIBS) $(XA_AUDIO_LIBS) -ljpeg -lpng $(shell pkg-config --libs libquicktime) |
| 100 |
+XA_INCS = $(INCLUDE) $(XA_VIDEO_INCS) $(XA_AUDIO_INCS) $(shell pkg-config --cflags libquicktime) |
| 101 |
CFLAGS = $(DEBUG) $(OPTIMIZE) |
| 102 |
|
| 103 |
##################################### |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.1 media-video/xanim-export/files/2.80.1-implicit_funcs.patch |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/xanim-export/files/2.80.1-implicit_funcs.patch?rev=1.1&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/xanim-export/files/2.80.1-implicit_funcs.patch?rev=1.1&content-type=text/plain |
| 111 |
|
| 112 |
Index: 2.80.1-implicit_funcs.patch |
| 113 |
=================================================================== |
| 114 |
--- xa_g72x.c |
| 115 |
+++ xa_g72x.c |
| 116 |
@@ -30,6 +30,7 @@ |
| 117 |
* Common routines for G.721 and G.723 conversions. |
| 118 |
*/ |
| 119 |
|
| 120 |
+#include <stdlib.h> |
| 121 |
#include "xa_g72x.h" |
| 122 |
|
| 123 |
static short power2[15] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80, |
| 124 |
--- xa_export.c |
| 125 |
+++ xa_export.c |
| 126 |
@@ -7,7 +7,8 @@ |
| 127 |
|
| 128 |
|
| 129 |
|
| 130 |
- |
| 131 |
+#include <stdlib.h> |
| 132 |
+#include <string.h> |
| 133 |
#include <stdio.h> |
| 134 |
#include <signal.h> |
| 135 |
#include <jpeglib.h> |
| 136 |
--- xa_audio.c |
| 137 |
+++ xa_audio.c |
| 138 |
@@ -227,7 +227,7 @@ |
| 139 |
*/ |
| 140 |
|
| 141 |
/* TOP */ |
| 142 |
- |
| 143 |
+#include <sys/ioctl.h> |
| 144 |
#include "xa_audio.h" |
| 145 |
|
| 146 |
/* POD note: For opening audio device non-blocking. Should probably set it |
Archives