[xf86-video-apm] repair sysroot for cross compilation

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

6 files changed, 212 insertions, 45 deletions

diff --git a/patches/xf86-video-apm-1.1.1/apm.diff b/patches/xf86-video-apm-1.1.1/apm.diff
deleted file mode 100644
index 83fc9b08e..000000000
--- a/patches/xf86-video-apm-1.1.1/apm.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Submitted-By: Erwin Rol, 2006-06-11
-# Committed-By: Luotao Fu
-#
-# Error:
-#
-# Includes Systemheader direcotry which is not
-# crosscompile aware.
-#
-# Description:
-#
-# add ${SYSROOT} manually to INCLUDEs in configure
-#
-# State:
-#
-# not for upstream
-#
-Index: xf86-video-apm-X11R7.1-1.1.1/configure.ac
-===================================================================
---- xf86-video-apm-X11R7.1-1.1.1.orig/configure.ac
-+++ xf86-video-apm-X11R7.1-1.1.1/configure.ac
-@@ -63,7 +63,7 @@ AC_SUBST([XF86RUSH_LIBS])
- AC_SUBST([XF86RUSH_CFLAGS])
- 
- CFLAGS="$CFLAGS $XORG_CFLAGS $XF86RUSH_CFLAGS"' -I$(top_srcdir)/src'
--INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix)/include'
-+INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src '"-I${SYSROOT}"'$(prefix)/include'
- AC_SUBST([CFLAGS])
- AC_SUBST([INCLUDES])
- 
-Index: xf86-video-apm-X11R7.1-1.1.1/configure
-===================================================================
---- xf86-video-apm-X11R7.1-1.1.1.orig/configure
-+++ xf86-video-apm-X11R7.1-1.1.1/configure
-@@ -20063,7 +20063,7 @@ fi
- 
- 
- CFLAGS="$CFLAGS $XORG_CFLAGS $XF86RUSH_CFLAGS"' -I$(top_srcdir)/src'
--INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix)/include'
-+INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src '"-I${SYSROOT}"'$(prefix)/include'
- 
- 
- 
diff --git a/patches/xf86-video-apm-1.1.1/series b/patches/xf86-video-apm-1.1.1/series
deleted file mode 100644
index 318297ca1..000000000
--- a/patches/xf86-video-apm-1.1.1/series
+++ /dev/null
@@ -1 +0,0 @@
-apm.diff
diff --git a/patches/xf86-video-apm-1.2.2/series b/patches/xf86-video-apm-1.2.2/series
new file mode 100644
index 000000000..98c746d03
--- /dev/null
+++ b/patches/xf86-video-apm-1.2.2/series
@@ -0,0 +1,2 @@
+xorg-driver-video-apm-1.2.2-sysroot.diff
+xorg-driver-video-apm-1.2.2-autoreconf.diff
diff --git a/patches/xf86-video-apm-1.2.2/xorg-driver-video-apm-1.2.2-autoreconf.diff b/patches/xf86-video-apm-1.2.2/xorg-driver-video-apm-1.2.2-autoreconf.diff
new file mode 100644
index 000000000..eb2bd408b
--- /dev/null
+++ b/patches/xf86-video-apm-1.2.2/xorg-driver-video-apm-1.2.2-autoreconf.diff
@@ -0,0 +1,180 @@
+---
+ configure |   46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+Index: xf86-video-apm-1.2.2/configure
+===================================================================
+--- xf86-video-apm-1.2.2.orig/configure
++++ xf86-video-apm-1.2.2/configure
+@@ -8322,7 +8322,7 @@ EOF
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+@@ -9236,7 +9236,7 @@ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+ need_lib_prefix=unknown
+-hardcode_into_libs=no
++hardcode_into_libs="no"
+ 
+ # when you set need_version to no, make sure it does not cause -set_version
+ # flags to be left without arguments
+@@ -11091,16 +11091,16 @@ shlibpath_overrides_runpath=$shlibpath_o
+ hardcode_action=$hardcode_action
+ 
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs="no"
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++hardcode_libdir_flag_spec=""
+ 
+ # If ld is used when linking, flag to hardcode \$libdir into
+ # a binary during linking. This must work even if \$libdir does
+ # not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
++hardcode_libdir_flag_spec_ld=""
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+@@ -13238,7 +13238,7 @@ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ 
+ need_lib_prefix=unknown
+-hardcode_into_libs=no
++hardcode_into_libs="no"
+ 
+ # when you set need_version to no, make sure it does not cause -set_version
+ # flags to be left without arguments
+@@ -14172,16 +14172,16 @@ shlibpath_overrides_runpath=$shlibpath_o
+ hardcode_action=$hardcode_action_CXX
+ 
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs="no"
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
++hardcode_libdir_flag_spec=""
+ 
+ # If ld is used when linking, flag to hardcode \$libdir into
+ # a binary during linking. This must work even if \$libdir does
+ # not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
++hardcode_libdir_flag_spec_ld=""
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+@@ -15026,7 +15026,7 @@ EOF
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+@@ -15869,7 +15869,7 @@ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ 
+ need_lib_prefix=unknown
+-hardcode_into_libs=no
++hardcode_into_libs="no"
+ 
+ # when you set need_version to no, make sure it does not cause -set_version
+ # flags to be left without arguments
+@@ -16803,16 +16803,16 @@ shlibpath_overrides_runpath=$shlibpath_o
+ hardcode_action=$hardcode_action_F77
+ 
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs="no"
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
++hardcode_libdir_flag_spec=""
+ 
+ # If ld is used when linking, flag to hardcode \$libdir into
+ # a binary during linking. This must work even if \$libdir does
+ # not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
++hardcode_libdir_flag_spec_ld=""
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+@@ -17637,7 +17637,7 @@ EOF
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+@@ -18500,7 +18500,7 @@ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+ 
+ need_lib_prefix=unknown
+-hardcode_into_libs=no
++hardcode_into_libs="no"
+ 
+ # when you set need_version to no, make sure it does not cause -set_version
+ # flags to be left without arguments
+@@ -19434,16 +19434,16 @@ shlibpath_overrides_runpath=$shlibpath_o
+ hardcode_action=$hardcode_action_GCJ
+ 
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs="no"
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
++hardcode_libdir_flag_spec=""
+ 
+ # If ld is used when linking, flag to hardcode \$libdir into
+ # a binary during linking. This must work even if \$libdir does
+ # not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
++hardcode_libdir_flag_spec_ld=""
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+@@ -19920,16 +19920,16 @@ shlibpath_overrides_runpath=$shlibpath_o
+ hardcode_action=$hardcode_action_RC
+ 
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs="no"
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
++hardcode_libdir_flag_spec=""
+ 
+ # If ld is used when linking, flag to hardcode \$libdir into
+ # a binary during linking. This must work even if \$libdir does
+ # not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
++hardcode_libdir_flag_spec_ld=""
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+@@ -21512,7 +21512,7 @@ fi
+ 
+ 
+ CFLAGS="$CFLAGS $XORG_CFLAGS $XF86RUSH_CFLAGS"' -I$(top_srcdir)/src'
+-INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix)/include'
++INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src '"-I${SYSROOT}"'$(prefix)/include'
+ 
+ 
+ 
diff --git a/patches/xf86-video-apm-1.2.2/xorg-driver-video-apm-1.2.2-sysroot.diff b/patches/xf86-video-apm-1.2.2/xorg-driver-video-apm-1.2.2-sysroot.diff
new file mode 100644
index 000000000..f8620ba3b
--- /dev/null
+++ b/patches/xf86-video-apm-1.2.2/xorg-driver-video-apm-1.2.2-sysroot.diff
@@ -0,0 +1,29 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: [xf86-video-apm] add sysroot support
+
+The xf86-video-apm packet tries to include headers from
+$(prefix)/include, which isn't correct. Usually, when building
+distributions, packets are configured with --prefix=/usr and installed
+with SYSROOTS=....
+
+Signed-off-by: Erwin Rol <erwin@erwinrol.com>
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xf86-video-apm-1.2.2/configure.ac
+===================================================================
+--- xf86-video-apm-1.2.2.orig/configure.ac
++++ xf86-video-apm-1.2.2/configure.ac
+@@ -67,7 +67,7 @@ AC_SUBST([XF86RUSH_LIBS])
+ AC_SUBST([XF86RUSH_CFLAGS])
+ 
+ CFLAGS="$CFLAGS $XORG_CFLAGS $XF86RUSH_CFLAGS"' -I$(top_srcdir)/src'
+-INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src -I$(prefix)/include'
++INCLUDES="$XORG_INCS -I${sdkdir} $XF86RUSH_INCS "'-I$(top_srcdir)/src '"-I${SYSROOT}"'$(prefix)/include'
+ AC_SUBST([CFLAGS])
+ AC_SUBST([INCLUDES])
+ 
diff --git a/rules/xorg-driver-video-apm.make b/rules/xorg-driver-video-apm.make
index 37e116549..763c265c6 100644
--- a/rules/xorg-driver-video-apm.make
+++ b/rules/xorg-driver-video-apm.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_APM) += xorg-driver-video-apm
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_APM_VERSION	:= 1.2.1
+XORG_DRIVER_VIDEO_APM_VERSION	:= 1.2.2
 XORG_DRIVER_VIDEO_APM		:= xf86-video-apm-$(XORG_DRIVER_VIDEO_APM_VERSION)
 XORG_DRIVER_VIDEO_APM_SUFFIX	:= tar.bz2
 XORG_DRIVER_VIDEO_APM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX)