libid3tag: Use tenacityteam fork #26140

AbrilRBS · 2024-12-09T13:07:29Z

Summary

Changes to recipe: libid3tag/[*]

Motivation

The original repository for libid3tag is no longer (and has been for a while) the preferred way to use the library, opting instead for https://codeberg.org/tenacityteam/libid3tag, which as of right now is even ABI compatible with the latest version.

This fork usage simplifies the recipe and maintenance by a lot, while also providing fixes for the old versions, such as Macos crossbuild support on shared libraries.

Audiowaveform is the only CCI recipe using the old version, we should think about bumping it too

Details

This fork is used by many, such as:

So this PR only brings CCI inline with the rest of the ecosystem for this library

The main consideration for this PR is the test changes, which are explained in the comment for the test_package under Windows&shared

Successful crossbuilding on Macos shared, which previously was disabled due to compilation issues:

$ conan create . --version=0.16.3 -b=missing -o="*:shared=True" -s:h="arch=x86_64"

======== Exporting recipe to the cache ========
libid3tag/0.16.3: Exporting package recipe: /Users/abril/coding/conan-center-index/recipes/libid3tag/all/conanfile.py
libid3tag/0.16.3: exports: File 'conandata.yml' found. Exporting it...
libid3tag/0.16.3: Copied 1 '.py' file: conanfile.py
libid3tag/0.16.3: Copied 1 '.yml' file: conandata.yml
libid3tag/0.16.3: Exported to cache folder: /Users/abril/coding/conan-center-index/recipes/libid3tag/all/conan_home/p/libid394422040f821/e
libid3tag/0.16.3: Exported: libid3tag/0.16.3#3c014599d7ff30d113c9e82b28e7949a (2024-12-09 13:05:34 UTC)

======== Input profiles ========
Profile host:
[settings]
arch=x86_64
build_type=Release
compiler=apple-clang
compiler.cppstd=gnu17
compiler.libcxx=libc++
compiler.version=16
os=Macos
[options]
*:shared=True
[platform_tool_requires]
cmake/3.30.3
meson/1.5.2
[replace_tool_requires]
meson/*: meson/[>=1.0 <2]

Profile build:
[settings]
arch=armv8
build_type=Release
compiler=apple-clang
compiler.cppstd=gnu17
compiler.libcxx=libc++
compiler.version=16
os=Macos
[platform_tool_requires]
cmake/3.30.3
meson/1.5.2
[replace_tool_requires]
meson/*: meson/[>=1.0 <2]


======== Computing dependency graph ========
Graph root
    cli
Requirements
    libid3tag/0.16.3#3c014599d7ff30d113c9e82b28e7949a - Cache
    zlib/1.3.1#f52e03ae3d251dec704634230cd806a2 - Cache
Resolved version ranges
    zlib/[>=1.2.11 <2]: zlib/1.3.1

======== Computing necessary packages ========
Requirements
    libid3tag/0.16.3#3c014599d7ff30d113c9e82b28e7949a:a888dbcc0f90f6989ba0b43d09ddfa48fb47da94#dd67ace462749e0daa767fc162a40439 - Cache
    zlib/1.3.1#f52e03ae3d251dec704634230cd806a2:77502c7f95dc6af2b986b57cea96c4faddaf3ef8#c23a194587ec7c108b4e092507f60b6e - Cache

======== Installing packages ========
zlib/1.3.1: Already installed! (1 of 2)
libid3tag/0.16.3: Already installed! (2 of 2)
WARN: deprecated: Usage of deprecated Conan 1.X features that will be removed in Conan 2.X:
WARN: deprecated:     'cpp_info.names' used in: zlib/1.3.1

======== Launching test_package ========

======== Computing dependency graph ========
Graph root
    libid3tag/0.16.3 (test package): /Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/conanfile.py
Requirements
    libid3tag/0.16.3#3c014599d7ff30d113c9e82b28e7949a - Cache
    zlib/1.3.1#f52e03ae3d251dec704634230cd806a2 - Cache

======== Computing necessary packages ========
Requirements
    libid3tag/0.16.3#3c014599d7ff30d113c9e82b28e7949a:a888dbcc0f90f6989ba0b43d09ddfa48fb47da94#dd67ace462749e0daa767fc162a40439 - Cache
    zlib/1.3.1#f52e03ae3d251dec704634230cd806a2:77502c7f95dc6af2b986b57cea96c4faddaf3ef8#c23a194587ec7c108b4e092507f60b6e - Cache

======== Installing packages ========
zlib/1.3.1: Already installed! (1 of 2)
libid3tag/0.16.3: Already installed! (2 of 2)
WARN: deprecated: Usage of deprecated Conan 1.X features that will be removed in Conan 2.X:
WARN: deprecated:     'cpp_info.names' used in: zlib/1.3.1

======== Testing the package ========
Removing previously existing 'test_package' build folder: /Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/build/apple-clang-16-x86_64-gnu17-release
libid3tag/0.16.3 (test package): Test package build: build/apple-clang-16-x86_64-gnu17-release
libid3tag/0.16.3 (test package): Test package build folder: /Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/build/apple-clang-16-x86_64-gnu17-release
libid3tag/0.16.3 (test package): Writing generators to /Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/build/apple-clang-16-x86_64-gnu17-release/generators
libid3tag/0.16.3 (test package): Generator 'CMakeDeps' calling 'generate()'
libid3tag/0.16.3 (test package): CMakeDeps necessary find_package() and targets for your CMakeLists.txt
    find_package(libid3tag)
    target_link_libraries(... libid3tag::libid3tag)
libid3tag/0.16.3 (test package): Generator 'VirtualRunEnv' calling 'generate()'
libid3tag/0.16.3 (test package): Calling generate()
libid3tag/0.16.3 (test package): Generators folder: /Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/build/apple-clang-16-x86_64-gnu17-release/generators
libid3tag/0.16.3 (test package): CMakeToolchain generated: conan_toolchain.cmake
libid3tag/0.16.3 (test package): CMakeToolchain generated: /Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/build/apple-clang-16-x86_64-gnu17-release/generators/CMakePresets.json
libid3tag/0.16.3 (test package): CMakeToolchain generated: /Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/CMakeUserPresets.json
libid3tag/0.16.3 (test package): Generating aggregated env files
libid3tag/0.16.3 (test package): Generated aggregated env files: ['conanrun.sh', 'conanbuild.sh']

======== Testing the package: Building ========
libid3tag/0.16.3 (test package): Calling build()
libid3tag/0.16.3 (test package): Running CMake.configure()
libid3tag/0.16.3 (test package): RUN: cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE="generators/conan_toolchain.cmake" -DCMAKE_INSTALL_PREFIX="/Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package" -DCMAKE_POLICY_DEFAULT_CMP0091="NEW" -DCMAKE_BUILD_TYPE="Release" "/Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package"
-- Using Conan toolchain: /Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/build/apple-clang-16-x86_64-gnu17-release/generators/conan_toolchain.cmake
-- Conan toolchain: Defining architecture flag: -m64
-- Conan toolchain: Defining libcxx as C++ flags: -stdlib=libc++
-- Conan toolchain: C++ Standard 17 with extensions ON
-- The C compiler identification is AppleClang 16.0.0.16000026
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: /Library/Developer/CommandLineTools/usr/bin/cc - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Conan: Target declared 'libid3tag::libid3tag'
-- Conan: Target declared 'ZLIB::ZLIB'
-- Configuring done (0.4s)
-- Generating done (0.0s)
-- Build files have been written to: /Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/build/apple-clang-16-x86_64-gnu17-release

libid3tag/0.16.3 (test package): Running CMake.build()
libid3tag/0.16.3 (test package): RUN: cmake --build "/Users/abril/coding/conan-center-index/recipes/libid3tag/all/test_package/build/apple-clang-16-x86_64-gnu17-release" -- -j12
[ 50%] Building C object CMakeFiles/test_package.dir/test_package.c.o
[100%] Linking C executable test_package
[100%] Built target test_package


======== Testing the package: Executing test ========
libid3tag/0.16.3 (test package): Running test()

valgur · 2024-12-09T13:45:34Z

Thanks! Duplicates #23259, though.

valgur · 2024-12-09T13:59:30Z

recipes/libid3tag/all/conanfile.py

-            self.cpp_info.defines.append("ID3TAG_EXPORT=" + ("__declspec(dllimport)" if self.options.shared else ""))
-        else:
-            self.cpp_info.libs = ["id3tag"]
+        self.cpp_info.libs = ["id3tag"]


Suggested change

self.cpp_info.libs = ["id3tag"]

self.cpp_info.set_property("cmake_file_name", "id3tag")

self.cpp_info.set_property("cmake_target_name", "id3tag::id3tag")

self.cpp_info.set_property("pkg_config_name", "id3tag")

self.cpp_info.libs = ["id3tag"]

I would recommend including this info even if it matches the defaults. It makes it clear that these are the actual official target names and not just implicit values generated by Conan.

But the actual package name is libid3tag, so these would be necessary if the upstream are defining the targets as id3tag

Oh, I missed that part, since I copied these from my older PR.
Either way, these are valid:

https://codeberg.org/tenacityteam/libid3tag/src/branch/main/packaging

https://packages.debian.org/trixie/amd64/libid3tag0-dev/filelist

Please do double check these details when reviewing, as it's going to be a breaking change for the consumers or will at least needs a "backwards compatible" fix when corrected later.

recipes/libid3tag/all/conanfile.py

valgur · 2024-12-09T14:03:04Z

recipes/libid3tag/all/conanfile.py

-            self.options.rm_safe("fPIC")
-        self.settings.rm_safe("compiler.libcxx")
-        self.settings.rm_safe("compiler.cppstd")
+    languages = ["C"]


Nice! Would be great if this could be added to the package templates as well as the preferred alternative to self.settings.rm_safe("compiler.libcxx"); self.settings.rm_safe("compiler.cppstd").

memsharded · 2024-12-12T16:00:24Z

recipes/libid3tag/all/conanfile.py

-            self.cpp_info.defines.append("ID3TAG_EXPORT=" + ("__declspec(dllimport)" if self.options.shared else ""))
-        else:
-            self.cpp_info.libs = ["id3tag"]
+        self.cpp_info.libs = ["id3tag"]


But the actual package name is libid3tag, so these would be necessary if the upstream are defining the targets as id3tag

memsharded · 2024-12-12T16:02:58Z

recipes/libid3tag/all/test_package/conanfile.py

@@ -15,6 +15,12 @@ def requirements(self):
    def layout(self):
        cmake_layout(self)

+    def generate(self):
+        tc = CMakeToolchain(self)
+        if self.settings.os == "Windows" and self.dependencies[self.tested_reference_str].options.shared:


Not sure about the complexity of the test, specially when this doesn't seem something that the recipe is managing.

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

AbrilRBS added 2 commits December 9, 2024 13:56

Use fork for libid3tag

d2c6a87

Further cleanup

f1c04d3

AbrilRBS requested a review from danimtb December 9, 2024 13:07

AbrilRBS added 2 commits December 9, 2024 14:08

Hush the linter

c9e3b9f

update config.yml

c492c59

AbrilRBS changed the title ~~libid3tag: Use continuation fork~~ libid3tag: Use tenacityteam fork Dec 9, 2024

danimtb previously approved these changes Dec 9, 2024

View reviewed changes

valgur reviewed Dec 9, 2024

View reviewed changes

recipes/libid3tag/all/conanfile.py Outdated Show resolved Hide resolved

valgur reviewed Dec 9, 2024

View reviewed changes

valgur approved these changes Dec 9, 2024

View reviewed changes

valgur mentioned this pull request Dec 9, 2024

libid3tag: add v0.16.3 from an official fork #23259

Closed

jcar87 assigned jcar87 and memsharded Dec 12, 2024

memsharded reviewed Dec 12, 2024

View reviewed changes

Update recipes/libid3tag/all/conanfile.py

9aa11bd

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

danimtb dismissed their stale review via 9aa11bd December 12, 2024 16:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

libid3tag: Use tenacityteam fork #26140

libid3tag: Use tenacityteam fork #26140

AbrilRBS commented Dec 9, 2024 •

edited

Loading

valgur commented Dec 9, 2024 •

edited

Loading

valgur Dec 9, 2024

memsharded Dec 12, 2024

valgur Dec 12, 2024

valgur Dec 9, 2024 •

edited

Loading

memsharded Dec 12, 2024

memsharded Dec 12, 2024

-        self.cpp_info.libs = ["id3tag"]
+        self.cpp_info.set_property("cmake_file_name", "id3tag")
+        self.cpp_info.set_property("cmake_target_name", "id3tag::id3tag")
+        self.cpp_info.set_property("pkg_config_name", "id3tag")
+        self.cpp_info.libs = ["id3tag"]

libid3tag: Use tenacityteam fork #26140

Are you sure you want to change the base?

libid3tag: Use tenacityteam fork #26140

Conversation

AbrilRBS commented Dec 9, 2024 • edited Loading

Summary

Motivation

Details

valgur commented Dec 9, 2024 • edited Loading

valgur Dec 9, 2024

Choose a reason for hiding this comment

memsharded Dec 12, 2024

Choose a reason for hiding this comment

valgur Dec 12, 2024

Choose a reason for hiding this comment

valgur Dec 9, 2024 • edited Loading

Choose a reason for hiding this comment

memsharded Dec 12, 2024

Choose a reason for hiding this comment

memsharded Dec 12, 2024

Choose a reason for hiding this comment

AbrilRBS commented Dec 9, 2024 •

edited

Loading

valgur commented Dec 9, 2024 •

edited

Loading

valgur Dec 9, 2024 •

edited

Loading