Remove custom agg script

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 153e599..e19e182 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -222,7 +222,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg -m noac ${LUA}
     ipkg -m acnb ${VLC}  "--enable-mozilla --enable-qt4 --enable-ncurses"
     ipkg ${SDL}
-    ipkg -m noac ${AGG}
+    ipkg ${AGG} " \
+        --disable-static \
+        --enable-ctrl \
+        --enable-gpc"
     if [ "x${USE_GNASH}" = "xyes" ]; then
         ipkg ${GNASH}
     fi

diff --git a/stage5/patches/common/agg-2.5-autoconf.patch b/stage5/patches/common/agg-2.5-autoconf.patch
new file mode 100644 (file)
index 0000000..854233f
--- /dev/null
+++ b/stage5/patches/common/agg-2.5-autoconf.patch
@@ -0,0 +1,11 @@
+diff -Naur agg-2.5.orig/configure.in agg-2.5.new/configure.in
+--- agg-2.5.orig/configure.in  2006-10-09 00:06:36.000000000 -0400
++++ agg-2.5.new/configure.in   2014-12-26 17:01:44.889492042 -0500
+@@ -8,7 +8,6 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+ if test "x$U" != "x"; then
+   AC_MSG_ERROR(Compiler not ANSI compliant)
+ fi

diff --git a/stage5/patches/common/agg-2.5-xorg.patch b/stage5/patches/common/agg-2.5-xorg.patch
new file mode 100644 (file)
index 0000000..a994595
--- /dev/null
+++ b/stage5/patches/common/agg-2.5-xorg.patch
@@ -0,0 +1,12 @@
+diff -Naur agg-2.5.orig/src/platform/X11/Makefile.am agg-2.5.new/src/platform/X11/Makefile.am
+--- agg-2.5.orig/src/platform/X11/Makefile.am  2006-12-10 19:59:45.000000000 -0500
++++ agg-2.5.new/src/platform/X11/Makefile.am   2014-12-26 17:00:36.839486860 -0500
+@@ -1,7 +1,7 @@
+ if ENABLE_X11
+ lib_LTLIBRARIES = libaggplatformX11.la
+ 
+-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@  -L@x_libraries@
++libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
+ libaggplatformX11_la_SOURCES = agg_platform_support.cpp
+ libaggplatformX11_la_CXXFLAGS =  -I$(top_srcdir)/include -I@x_includes@
+ libaggplatformX11_la_LIBADD = -lX11

diff --git a/stage5/pkg/agg b/stage5/pkg/agg
deleted file mode 100644 (file)
index 7ed2522..0000000
--- a/stage5/pkg/agg
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    cd ${LFS_TMP}/${PACKAGE}
-    sed -i 's:  -L@x_libraries@::' src/platform/X11/Makefile.am
-    sed -i '/^AM_C_PROTOTYPES/d' configure.in
-    bash autogen.sh --prefix=/usr \
-        --disable-static \
-        --enable-ctrl \
-        --enable-gpc
-}