| Message ID | 1370521726-17125-1-git-send-email-jeremy.rosen@openwide.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
>>>>> "Jérémy" == Jérémy Rosen <jeremy.rosen@openwide.fr> writes:
Jérémy> removes a patch that was integrated upstream
Jérémy> Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
Jérémy> ---
Jérémy> .../pulseaudio-compat-with-json-c-0.11.patch | 26 --------------------
Then you should also drop the AUTORECONF. From pulseaudio.mk:
# One patch touches configure.ac. We unconditionnally need libglib2
# because configure.ac uses AM_GLIB_GNU_GETTEXT. This unconditionnal
# dependency can be removed once the patch is removed.
PULSEAUDIO_AUTORECONF = YES
PULSEAUDIO_DEPENDENCIES += libglib2
Jérémy> +++ b/package/multimedia/pulseaudio/pulseaudio.mk
Jérémy> @@ -3,7 +3,7 @@
Jérémy> # pulseaudio
Jérémy> #
Jérémy> ################################################################################
Jérémy> -PULSEAUDIO_VERSION = 3.0
Jérémy> +PULSEAUDIO_VERSION = 4.0
Jérémy> PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
Jérémy> PULSEAUDIO_INSTALL_STAGING = YES
Jérémy> PULSEAUDIO_CONF_OPT = \
From http://www.freedesktop.org/wiki/Software/PulseAudio/Notes/4.0/ I
see that the gtk support now needs gtk 3.x, which we don't have in
buildroot, so the optional libgtk2 support should get removed.
It would also be good if you could add license info while you're at it.
Ok, I will do all that in V2...
waiting a couple of days in case there is another review then I'll repost...
Cordialement
Jérémy Rosen
fight key loggers : write some perl using vim
----- Mail original -----
> >>>>> "Jérémy" == Jérémy Rosen <jeremy.rosen@openwide.fr> writes:
>
> Jérémy> removes a patch that was integrated upstream
> Jérémy> Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
> Jérémy> ---
> Jérémy> .../pulseaudio-compat-with-json-c-0.11.patch | 26
> --------------------
>
> Then you should also drop the AUTORECONF. From pulseaudio.mk:
>
> # One patch touches configure.ac. We unconditionnally need libglib2
> # because configure.ac uses AM_GLIB_GNU_GETTEXT. This unconditionnal
> # dependency can be removed once the patch is removed.
> PULSEAUDIO_AUTORECONF = YES
> PULSEAUDIO_DEPENDENCIES += libglib2
>
> Jérémy> +++ b/package/multimedia/pulseaudio/pulseaudio.mk
> Jérémy> @@ -3,7 +3,7 @@
> Jérémy> # pulseaudio
> Jérémy> #
> Jérémy>
> ################################################################################
> Jérémy> -PULSEAUDIO_VERSION = 3.0
> Jérémy> +PULSEAUDIO_VERSION = 4.0
> Jérémy> PULSEAUDIO_SITE =
> http://freedesktop.org/software/pulseaudio/releases/
> Jérémy> PULSEAUDIO_INSTALL_STAGING = YES
> Jérémy> PULSEAUDIO_CONF_OPT = \
>
> From http://www.freedesktop.org/wiki/Software/PulseAudio/Notes/4.0/ I
> see that the gtk support now needs gtk 3.x, which we don't have in
> buildroot, so the optional libgtk2 support should get removed.
>
> It would also be good if you could add license info while you're at
> it.
>
> --
> Bye, Peter Korsgaard
>
diff --git a/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch b/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch deleted file mode 100644 index 86efdfd..0000000 --- a/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 759c0bc6f990240287a14fa6dec029ecea581463 Mon Sep 17 00:00:00 2001 -From: Arun Raghavan <arun.raghavan@collabora.co.uk> -Date: Sat, 27 Apr 2013 03:27:05 +0000 -Subject: build-sys: json-c changed everything :( - -json-c 0.11 ships a pkg-config file with a different name, and changes -the name of its library as well. ---- -(limited to 'configure.ac') - -diff --git a/configure.ac b/configure.ac -index c8161a4..b1bd21a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -624,7 +624,8 @@ AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1]) - - #### json parsing #### - --PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ]) -+PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ], [], -+ [PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])]) - AC_SUBST(LIBJSON_CFLAGS) - AC_SUBST(LIBJSON_LIBS) - --- -cgit v0.9.0.2-2-gbebe diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk index 529f5dd..8c1773b 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -3,7 +3,7 @@ # pulseaudio # ################################################################################ -PULSEAUDIO_VERSION = 3.0 +PULSEAUDIO_VERSION = 4.0 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/ PULSEAUDIO_INSTALL_STAGING = YES PULSEAUDIO_CONF_OPT = \
removes a patch that was integrated upstream Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr> --- .../pulseaudio-compat-with-json-c-0.11.patch | 26 -------------------- package/multimedia/pulseaudio/pulseaudio.mk | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch