From patchwork Sat May 28 07:20:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 627389 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rGvRl1CB7z9t4P for ; Sat, 28 May 2016 17:20:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 99331930B6; Sat, 28 May 2016 07:20:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zVclxkvzzV5v; Sat, 28 May 2016 07:20:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3DB45930CE; Sat, 28 May 2016 07:20:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7EE291C2175 for ; Sat, 28 May 2016 07:20:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7BA90930CE for ; Sat, 28 May 2016 07:20:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uyrSuBvDXaCA for ; Sat, 28 May 2016 07:20:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by whitealder.osuosl.org (Postfix) with ESMTPS id E9968930B6 for ; Sat, 28 May 2016 07:20:29 +0000 (UTC) Received: from fwd10.aul.t-online.de (fwd10.aul.t-online.de [172.20.26.152]) by mailout09.t-online.de (Postfix) with SMTP id B3D0F42750A7 for ; Sat, 28 May 2016 09:20:27 +0200 (CEST) Received: from fli4l.lan.fli4l (VsqFdkZC8hacczhFq3nd9-UOIfQ7G7-YDYw3RIn2eFQ0kZsc+4hA+ljKbYhzrAMgbo@[84.191.209.143]) by fwd10.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1b6YXp-4Xfa0e0; Sat, 28 May 2016 09:20:25 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:47466 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.87) (envelope-from ) id 1b6YXo-0001Nr-FB; Sat, 28 May 2016 09:20:24 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 28 May 2016 09:20:13 +0200 Message-Id: <1464420013-23211-2-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464420013-23211-1-git-send-email-bernd.kuhls@t-online.de> References: <1464420013-23211-1-git-send-email-bernd.kuhls@t-online.de> X-ID: VsqFdkZC8hacczhFq3nd9-UOIfQ7G7-YDYw3RIn2eFQ0kZsc+4hA+ljKbYhzrAMgbo X-TOI-MSGID: 323bcc4b-91f0-4170-85e6-8b8f7885f956 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH/next 2/2] package/taglib: bump to version 1.11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Removed 0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch, a similar patch was committed upstream: https://github.com/taglib/taglib/commit/ea55c8b5c1e3b72789c302aa2560d9c87faedd40 Also remove empty line from Config.in. Signed-off-by: Bernd Kuhls --- ...he-standard-CMake-flag-to-drive-the-share.patch | 40 ---------------------- package/taglib/Config.in | 1 - package/taglib/taglib.hash | 2 +- package/taglib/taglib.mk | 2 +- 4 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 package/taglib/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch diff --git a/package/taglib/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch b/package/taglib/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch deleted file mode 100644 index 535ccb4..0000000 --- a/package/taglib/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4e6a75eed3602f10aff516f49c8088c6da8db9df Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 31 Aug 2014 12:11:57 +0200 -Subject: [PATCH 1/1] cmake: use the standard CMake flag to drive the shared - object build - -If BUILD_SHARED_LIBS is set and ENABLE_STATIC undefined, then drive -ENABLE_STATIC with the BUILD_SHARED_LIBS value. - -Signed-off-by: Samuel Martin ---- - CMakeLists.txt | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 317ffa1..9931957 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,17 @@ project(taglib) - - cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR) - --option(ENABLE_STATIC "Make static version of libtag" OFF) -+# Use the standard CMake flag to drive the shared object build. -+if(DEFINED BUILD_SHARED_LIBS AND NOT DEFINED ENABLE_STATIC) -+ if(BUILD_SHARED_LIBS) -+ set(ENABLE_STATIC OFF) -+ else() -+ set(ENABLE_STATIC ON) -+ endif() -+else() -+ option(ENABLE_STATIC "Make static version of libtag" OFF) -+endif() -+ - if(ENABLE_STATIC) - add_definitions(-DTAGLIB_STATIC) - set(BUILD_SHARED_LIBS OFF) --- -2.1.0 - diff --git a/package/taglib/Config.in b/package/taglib/Config.in index 209837f..6521d48 100644 --- a/package/taglib/Config.in +++ b/package/taglib/Config.in @@ -1,4 +1,3 @@ - config BR2_PACKAGE_TAGLIB bool "taglib" depends on BR2_INSTALL_LIBSTDCPP diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash index 86ac6a4..a3cfc79 100644 --- a/package/taglib/taglib.hash +++ b/package/taglib/taglib.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a taglib-1.9.1.tar.gz +sha256 ed4cabb3d970ff9a30b2620071c2b054c4347f44fc63546dbe06f97980ece288 taglib-1.11.tar.gz diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index 2410650..0a2ca4d 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAGLIB_VERSION = 1.9.1 +TAGLIB_VERSION = 1.11 TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPLv2.1, MPL