From 7932f25828c9a597ed3b748a61ed0659c3e00360 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 10 Jun 2017 22:35:10 +0200 Subject: pulseaudio: need autoreconf --- package/pulseaudio/Makefile | 3 ++ package/pulseaudio/patches/patch-Makefile_am | 11 +++++ package/pulseaudio/patches/patch-configure_ac | 55 ++++++++++++++++++++++ package/pulseaudio/patches/patch-configure_ac.orig | 30 ++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 package/pulseaudio/patches/patch-Makefile_am create mode 100644 package/pulseaudio/patches/patch-configure_ac create mode 100644 package/pulseaudio/patches/patch-configure_ac.orig (limited to 'package/pulseaudio') diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index 3593bee57..68030d227 100644 --- a/package/pulseaudio/Makefile +++ b/package/pulseaudio/Makefile @@ -25,6 +25,9 @@ $(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},$ TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE +# use libtool from host directory +AUTOTOOL_STYLE:= autoreconf + ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),y) CONFIGURE_ARGS+= --enable-neon-opt else diff --git a/package/pulseaudio/patches/patch-Makefile_am b/package/pulseaudio/patches/patch-Makefile_am new file mode 100644 index 000000000..11132dad5 --- /dev/null +++ b/package/pulseaudio/patches/patch-Makefile_am @@ -0,0 +1,11 @@ +--- pulseaudio-10.0.orig/Makefile.am 2017-01-18 04:45:11.000000000 +0100 ++++ pulseaudio-10.0/Makefile.am 2017-06-06 19:51:59.372820444 +0200 +@@ -42,7 +42,7 @@ EXTRA_DIST = \ + src/daemon/.gitignore \ + src/pulse/.gitignore + +-SUBDIRS = src doxygen man po ++SUBDIRS = src + + MAINTAINERCLEANFILES = + noinst_DATA = diff --git a/package/pulseaudio/patches/patch-configure_ac b/package/pulseaudio/patches/patch-configure_ac new file mode 100644 index 000000000..2ba044a9b --- /dev/null +++ b/package/pulseaudio/patches/patch-configure_ac @@ -0,0 +1,55 @@ +--- pulseaudio-10.0.orig/configure.ac 2017-01-13 04:02:18.000000000 +0100 ++++ pulseaudio-10.0/configure.ac 2017-06-06 20:05:26.400612037 +0200 +@@ -97,24 +97,8 @@ AS_IF([test "x$M4" = "xno"], AC_MSG_ERRO + + PKG_PROG_PKG_CONFIG + +-# gettext +- +-if test "x$enable_nls" != "xno"; then +-IT_PROG_INTLTOOL([0.35.0]) +- +-AM_GNU_GETTEXT_VERSION([0.18.1]) +-AM_GNU_GETTEXT([external]) +- +-GETTEXT_PACKAGE=pulseaudio +-AC_SUBST([GETTEXT_PACKAGE]) +-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) +-else +-# workaround till an intltool m4 bug is fixed upstream +-# (https://bugs.launchpad.net/intltool/+bug/904647) + USE_NLS=no + AC_SUBST(USE_NLS) +-fi +- + + #### Determine host OS #### + +@@ -1486,27 +1470,10 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x + AC_CONFIG_FILES([ + Makefile + src/Makefile +-man/Makefile + libpulse.pc + libpulse-simple.pc + libpulse-mainloop-glib.pc +-doxygen/Makefile +-doxygen/doxygen.conf + src/pulse/version.h +-po/Makefile.in +-man/pulseaudio.1.xml +-man/esdcompat.1.xml +-man/pax11publish.1.xml +-man/pacat.1.xml +-man/pacmd.1.xml +-man/pactl.1.xml +-man/pasuspender.1.xml +-man/padsp.1.xml +-man/pulse-daemon.conf.5.xml +-man/pulse-client.conf.5.xml +-man/default.pa.5.xml +-man/pulse-cli-syntax.5.xml +-man/start-pulseaudio-x11.1.xml + ]) + + AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat]) diff --git a/package/pulseaudio/patches/patch-configure_ac.orig b/package/pulseaudio/patches/patch-configure_ac.orig new file mode 100644 index 000000000..080625897 --- /dev/null +++ b/package/pulseaudio/patches/patch-configure_ac.orig @@ -0,0 +1,30 @@ +--- pulseaudio-10.0.orig/configure.ac 2017-01-13 04:02:18.000000000 +0100 ++++ pulseaudio-10.0/configure.ac 2017-06-06 20:01:20.772848693 +0200 +@@ -1486,27 +1486,10 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x + AC_CONFIG_FILES([ + Makefile + src/Makefile +-man/Makefile + libpulse.pc + libpulse-simple.pc + libpulse-mainloop-glib.pc +-doxygen/Makefile +-doxygen/doxygen.conf + src/pulse/version.h +-po/Makefile.in +-man/pulseaudio.1.xml +-man/esdcompat.1.xml +-man/pax11publish.1.xml +-man/pacat.1.xml +-man/pacmd.1.xml +-man/pactl.1.xml +-man/pasuspender.1.xml +-man/padsp.1.xml +-man/pulse-daemon.conf.5.xml +-man/pulse-client.conf.5.xml +-man/default.pa.5.xml +-man/pulse-cli-syntax.5.xml +-man/start-pulseaudio-x11.1.xml + ]) + + AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat]) -- cgit v1.2.3