All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/taglib: bump to version 1.13
@ 2022-10-28 22:02 Fabrice Fontaine
  2022-10-30 16:17 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-10-28 22:02 UTC (permalink / raw)
  To: buildroot; +Cc: Bernd Kuhls, Fabrice Fontaine

- Drop patch (already in version)
- Use WITH_ZLIB which is available since
  https://github.com/taglib/taglib/commit/1644c0dd87f40a2492bde4011fe72257fc72ee0e

https://github.com/taglib/taglib/releases/tag/v1.13

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...e-on-systems-without-HAVE_GCC_ATOMIC.patch | 34 -------------------
 package/taglib/taglib.hash                    |  2 +-
 package/taglib/taglib.mk                      |  5 ++-
 3 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch

diff --git a/package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch b/package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch
deleted file mode 100644
index d8af73cb08..0000000000
--- a/package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1d24bd3399f2284104cbe87d017f87325b1797ab Mon Sep 17 00:00:00 2001
-From: Oleg Antonyan <oleg.b.antonyan@gmail.com>
-Date: Thu, 13 May 2021 16:41:35 +0200
-Subject: [PATCH] =?UTF-8?q?Fix=20"error:=20duplicate=20=E2=80=98volatile?=
- =?UTF-8?q?=E2=80=99"=20on=20systems=20without=20HAVE=5FGCC=5FATOMIC=20in?=
- =?UTF-8?q?=201.12=20(#1012)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* fix error: duplicate volatile
-
-* fix volatile ATOMIC_INT in constructor
-
-[Retrieved from:
-https://github.com/taglib/taglib/commit/1d24bd3399f2284104cbe87d017f87325b1797ab]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- taglib/toolkit/trefcounter.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/taglib/toolkit/trefcounter.cpp b/taglib/toolkit/trefcounter.cpp
-index 18cb596c0..5b089abf9 100644
---- a/taglib/toolkit/trefcounter.cpp
-+++ b/taglib/toolkit/trefcounter.cpp
-@@ -52,7 +52,7 @@
- # define ATOMIC_INC(x) __sync_add_and_fetch(&x, 1)
- # define ATOMIC_DEC(x) __sync_sub_and_fetch(&x, 1)
- #else
--# define ATOMIC_INT volatile int
-+# define ATOMIC_INT int
- # define ATOMIC_INC(x) (++x)
- # define ATOMIC_DEC(x) (--x)
- #endif
diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash
index 38a44b41a5..7d1b2e8422 100644
--- a/package/taglib/taglib.hash
+++ b/package/taglib/taglib.hash
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256  7fccd07669a523b07a15bd24c8da1bbb92206cb19e9366c3692af3d79253b703  taglib-1.12.tar.gz
+sha256  58f08b4db3dc31ed152c04896ee9172d22052bc7ef12888028c01d8b1d60ade0  taglib-1.13.tar.gz
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPL
 sha256  53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f  COPYING.MPL
diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index 9513e0d0e1..c687891002 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TAGLIB_VERSION = 1.12
+TAGLIB_VERSION = 1.13
 TAGLIB_SITE = http://taglib.github.io/releases
 TAGLIB_INSTALL_STAGING = YES
 TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1
@@ -13,6 +13,9 @@ TAGLIB_CPE_ID_VENDOR = taglib
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 TAGLIB_DEPENDENCIES += zlib
+TAGLIB_CONF_OPTS += -DWITH_ZLIB=ON
+else
+TAGLIB_CONF_OPTS += -DWITH_ZLIB=OFF
 endif
 
 define TAGLIB_REMOVE_DEVFILE
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/taglib: bump to version 1.13
  2022-10-28 22:02 [Buildroot] [PATCH 1/1] package/taglib: bump to version 1.13 Fabrice Fontaine
@ 2022-10-30 16:17 ` Yann E. MORIN
  0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2022-10-30 16:17 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot

Fabrice, All,

On 2022-10-29 00:02 +0200, Fabrice Fontaine spake thusly:
> - Drop patch (already in version)
> - Use WITH_ZLIB which is available since
>   https://github.com/taglib/taglib/commit/1644c0dd87f40a2492bde4011fe72257fc72ee0e
> 
> https://github.com/taglib/taglib/releases/tag/v1.13
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...e-on-systems-without-HAVE_GCC_ATOMIC.patch | 34 -------------------
>  package/taglib/taglib.hash                    |  2 +-
>  package/taglib/taglib.mk                      |  5 ++-
>  3 files changed, 5 insertions(+), 36 deletions(-)
>  delete mode 100644 package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch
> 
> diff --git a/package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch b/package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch
> deleted file mode 100644
> index d8af73cb08..0000000000
> --- a/package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From 1d24bd3399f2284104cbe87d017f87325b1797ab Mon Sep 17 00:00:00 2001
> -From: Oleg Antonyan <oleg.b.antonyan@gmail.com>
> -Date: Thu, 13 May 2021 16:41:35 +0200
> -Subject: [PATCH] =?UTF-8?q?Fix=20"error:=20duplicate=20=E2=80=98volatile?=
> - =?UTF-8?q?=E2=80=99"=20on=20systems=20without=20HAVE=5FGCC=5FATOMIC=20in?=
> - =?UTF-8?q?=201.12=20(#1012)?=
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -* fix error: duplicate volatile
> -
> -* fix volatile ATOMIC_INT in constructor
> -
> -[Retrieved from:
> -https://github.com/taglib/taglib/commit/1d24bd3399f2284104cbe87d017f87325b1797ab]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - taglib/toolkit/trefcounter.cpp | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/taglib/toolkit/trefcounter.cpp b/taglib/toolkit/trefcounter.cpp
> -index 18cb596c0..5b089abf9 100644
> ---- a/taglib/toolkit/trefcounter.cpp
> -+++ b/taglib/toolkit/trefcounter.cpp
> -@@ -52,7 +52,7 @@
> - # define ATOMIC_INC(x) __sync_add_and_fetch(&x, 1)
> - # define ATOMIC_DEC(x) __sync_sub_and_fetch(&x, 1)
> - #else
> --# define ATOMIC_INT volatile int
> -+# define ATOMIC_INT int
> - # define ATOMIC_INC(x) (++x)
> - # define ATOMIC_DEC(x) (--x)
> - #endif
> diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash
> index 38a44b41a5..7d1b2e8422 100644
> --- a/package/taglib/taglib.hash
> +++ b/package/taglib/taglib.hash
> @@ -1,4 +1,4 @@
>  # Locally calculated
> -sha256  7fccd07669a523b07a15bd24c8da1bbb92206cb19e9366c3692af3d79253b703  taglib-1.12.tar.gz
> +sha256  58f08b4db3dc31ed152c04896ee9172d22052bc7ef12888028c01d8b1d60ade0  taglib-1.13.tar.gz
>  sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPL
>  sha256  53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f  COPYING.MPL
> diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
> index 9513e0d0e1..c687891002 100644
> --- a/package/taglib/taglib.mk
> +++ b/package/taglib/taglib.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -TAGLIB_VERSION = 1.12
> +TAGLIB_VERSION = 1.13
>  TAGLIB_SITE = http://taglib.github.io/releases
>  TAGLIB_INSTALL_STAGING = YES
>  TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1
> @@ -13,6 +13,9 @@ TAGLIB_CPE_ID_VENDOR = taglib
>  
>  ifeq ($(BR2_PACKAGE_ZLIB),y)
>  TAGLIB_DEPENDENCIES += zlib
> +TAGLIB_CONF_OPTS += -DWITH_ZLIB=ON
> +else
> +TAGLIB_CONF_OPTS += -DWITH_ZLIB=OFF
>  endif
>  
>  define TAGLIB_REMOVE_DEVFILE
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-30 16:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-28 22:02 [Buildroot] [PATCH 1/1] package/taglib: bump to version 1.13 Fabrice Fontaine
2022-10-30 16:17 ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.