taglib-ruby 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1289419ad11f81f79052e260fbb9e1debbf2cd956389797bb6b664356e287ec0
-  data.tar.gz: '0582a88e09b6e96108a2e4a51a34e5c486f0552918780f38b1c4f05a448745d3'
+  metadata.gz: 659d2ce981f60aaee4cdc2ada2ace70d33d55f2f1414478f03a8088facaedb98
+  data.tar.gz: 4baf4450e6903749e1f5a9829d2f83e4fa3809ec24974950d006992a50c35c78
 SHA512:
-  metadata.gz: 966e6e0fed73bb68ed20a6f4e9cab07b98f476220e5a294d77f679ea748ddb245e5221241845c7ad515337d1d3f673ebce6cb293cc97ca5e773a385e7e7110e3
-  data.tar.gz: 35ac3a6342f59be0c6641b861a0c9c9f2b00a2914d12fa8bc4bc05b5ba3af5c2f0199d8b3eb67155146b142274597ab8456ed1df48a72b30bbf90a1ebe86caf5
+  metadata.gz: 3df1ff745ae3e67a269f69f20820372c25d91a5d51fe916ffc590014518dad82d8674a526df4763449543246bef6e23d4ba6766513d5214c96e68b3a14b89846
+  data.tar.gz: f114af2a78f0ea69335ceff09cc1152ca9050b8519ebc318b85a854734d063f531cdf6176c10e1c487533d7fef58819e0a35431940a4c75e836c2e76e1f3e1c0

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: robinst

data/CHANGELOG.md

@@ -6,6 +6,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.0.0
+### Changed
+- Regenerate SWIG wrapper code against TagLib 2.0.1. This breaks
+  compatibility with TagLib 1.x. You will get a compiler error if you
+  try to install taglib-ruby 2.x on a system that has TagLib 1.x.
+  Please use taglib-ruby 1.x if your system has TagLib 1.x, and
+  taglib-ruby 2.x if your system has TagLib 2.x.
+- The optional `strip_others` argument to `TagLib::MPEG::File#save` no
+  longer takes a boolean value. It now uses the constants
+  `TagLib::File::StripOthers` and `TagLib::File::StripNone`.
+
+### Removed
+- `TagLib::MPEG::File#tag` has been removed because it no longer
+  exists in TagLib 2.x. Please use `TagLib::MPEG::File#id3v2_tag` or
+  `TagLib::MPEG::File#id3v1_tag`.
+
+## 1.1.3 - 2022-12-29
+### Changed
+- Fix warning `warning: undefining the allocator of T_DATA class
+  swig_runtime_data` on Ruby 3.2
+- Upgraded to SWIG 4.1.1
+
 ## 1.1.2 - 2022-04-13
 ### Fixed
 - Fix UserTextIdentificationFrame's constructor so that overloaded

data/README.md

@@ -30,9 +30,13 @@ installed with header files (and a C++ compiler of course):
 * Brew: `brew install taglib`
 * MacPorts: `sudo port install taglib`
 
-Then do:
+Then install the latest taglib-ruby 1.x by running:
 
-    gem install taglib-ruby
+    gem install taglib-ruby --version '< 2'
+
+If you are using TagLib 2.0.1 or higher, you need to install taglib-ruby 2.x instead:
+
+    gem install taglib-ruby --version '>= 2'
 
 ### MacOS
 
@@ -40,16 +44,20 @@ Depending on your brew setup, TagLib might be installed in different locations,
 which makes it hard for taglib-ruby to find it. To get the library location, run:
 
     $ brew info taglib
-    taglib: stable 1.12 (bottled), HEAD
+    taglib: stable 1.13 (bottled), HEAD
     Audio metadata library
     https://taglib.org/
-    /usr/local/Cellar/taglib/1.12 (122 files, 1.5MB) *
+    /opt/homebrew/Cellar/taglib/1.13 (122 files, 1.6MB) *
     ...
 
 Note the line with the path at the end. Provide that using the `TAGLIB_DIR`
 environment variable when installing, like this:
 
-    TAGLIB_DIR=/usr/local/Cellar/taglib/1.12 gem install taglib-ruby
+    TAGLIB_DIR=/opt/homebrew/Cellar/taglib/1.13 gem install taglib-ruby
+
+If you're using bundler, like this:
+
+    TAGLIB_DIR=/opt/homebrew/Cellar/taglib/1.13 bundle install
 
 Another problem might be that `clang++` doesn't work with a specific version
 of TagLib. In that case, try compiling taglib-ruby's C++ extensions with a
@@ -116,18 +124,14 @@ Build a specific version of Taglib:
 The above command will automatically download Taglib 1.11.1, build it and
 install it in `tmp/x86_64-linux/taglib-1.11.1`.
 
-The `swig` and `compile` tasks can then be executed against that specific
+The `swig`, `compile` and `test` tasks can then be executed against that specific
 version of Taglib by setting the `TAGLIB_DIR` environment variable to
 `$PWD/tmp/x86_64-linux/taglib-1.11.1` (it is assumed that taglib headers are
 located at `$TAGLIB_DIR/include` and taglib libraries at `$TAGLIB_DIR/lib`).
 
-The `test` task can then be run for that version of Taglib by adding
-`$PWD/tmp/x86_64-linux/taglib-1.11.1/lib` to the `LD_LIBRARY_PATH` environment
-variable.
-
 To do everything in one command:
 
-    PLATFORM=x86_64-linux TAGLIB_VERSION=1.11.1 TAGLIB_DIR=$PWD/tmp/x86_64-linux/taglib-1.11.1 LD_LIBRARY_PATH=$PWD/tmp/x86_64-linux/taglib-1.11.1/lib rake vendor compile test
+    PLATFORM=x86_64-linux TAGLIB_VERSION=1.11.1 TAGLIB_DIR=$PWD/tmp/x86_64-linux/taglib-1.11.1 rake vendor compile test
 
 ### Workflow
 
@@ -151,7 +155,7 @@ To do everything in one command:
 
 ## License
 
-Copyright (c) 2010-2020 Robin Stocker and others, see Git history.
+Copyright (c) 2010-2022 Robin Stocker and others, see Git history.
 
 `taglib-ruby` is distributed under the MIT License, see
 [LICENSE.txt](LICENSE.txt) for details.

data/docs/taglib/mpeg.rb

@@ -32,14 +32,6 @@ module TagLib::MPEG
     def initialize(filename, read_properties=true)
     end
 
-    # Returns a tag that contains attributes from both the ID3v2 and
-    # ID3v1 tag, with ID3v2 attributes having precendence.
-    #
-    # @return [TagLib::Tag]
-    # @return [nil] if not present
-    def tag
-    end
-
     # Returns the ID3v1 tag.
     #
     # @param create if a new tag should be created when none exists
@@ -88,7 +80,7 @@ module TagLib::MPEG
     #   ArgumentError.
     #
     # @return [Boolean] whether saving was successful
-    def save(tags=TagLib::MPEG::File::AllTags, strip_others=true)
+    def save(tags=TagLib::MPEG::File::AllTags, strip_others=TagLib::File::StripOthers)
     end
 
     # Strip the specified tags from the file. Note that this directly

data/ext/extconf_common.rb

@@ -1,15 +1,19 @@
 # frozen-string-literal: true
 
-# Default opt dirs to help mkmf find taglib
-opt_dirs = ['/usr/local', '/opt/local', '/sw']
-
-# Heroku vendor dir
-vendor = ENV.fetch('GEM_HOME', '')[/^[^ ]*\/vendor\//]
-opt_dirs << "#{vendor}taglib" if vendor
-opt_dirs_joined = opt_dirs.join(':')
-
-configure_args = "--with-opt-dir=#{opt_dirs_joined} "
-ENV['CONFIGURE_ARGS'] = configure_args + ENV.fetch('CONFIGURE_ARGS', '')
+taglib_dir = ENV['TAGLIB_DIR']
+
+unless taglib_dir
+  # Default opt dirs to help mkmf find taglib
+  opt_dirs = ['/usr/local', '/opt/local', '/sw']
+  
+  # Heroku vendor dir
+  vendor = ENV.fetch('GEM_HOME', '')[/^[^ ]*\/vendor\//]
+  opt_dirs << "#{vendor}taglib" if vendor
+  opt_dirs_joined = opt_dirs.join(':')
+  
+  configure_args = "--with-opt-dir=#{opt_dirs_joined} "
+  ENV['CONFIGURE_ARGS'] = configure_args + ENV.fetch('CONFIGURE_ARGS', '')
+end
 
 require 'mkmf'
 
@@ -18,14 +22,14 @@ def error(msg)
   abort
 end
 
-if ENV.key?('TAGLIB_DIR') && !File.directory?(ENV['TAGLIB_DIR'])
+if taglib_dir && !File.directory?(taglib_dir)
   error 'When defined, the TAGLIB_DIR environment variable must point to a valid directory.'
 end
 
 # If specified, use the TAGLIB_DIR environment variable as the prefix
 # for finding taglib headers and libs. See MakeMakefile#dir_config
 # for more details.
-dir_config('tag', (ENV['TAGLIB_DIR'] if ENV.key?('TAGLIB_DIR')))
+dir_config('tag', taglib_dir)
 
 # When compiling statically, -lstdc++ would make the resulting .so to
 # have a dependency on an external libstdc++ instead of the static one.
@@ -46,5 +50,10 @@ end
 
 $CFLAGS << ' -DSWIG_TYPE_TABLE=taglib'
 
+# TagLib 2.0 requires C++17. Some compilers default to an older standard
+# so we add this '-std=' option to make sure the compiler accepts C++17
+# code.
+$CXXFLAGS << ' -std=c++17'
+
 # Allow users to override the Ruby runtime's preferred CXX
 RbConfig::MAKEFILE_CONFIG['CXX'] = ENV['TAGLIB_RUBY_CXX'] if ENV['TAGLIB_RUBY_CXX']

data/ext/taglib_aiff/taglib_aiff.i

@@ -14,15 +14,20 @@
 %ignore TagLib::RIFF::AIFF::Properties::length;
 %ignore TagLib::RIFF::AIFF::Properties::sampleWidth;
 
+%ignore TagLib::RIFF::File;
+%include <taglib/rifffile.h>
+
 %include <taglib/aiffproperties.h>
 
 %freefunc TagLib::RIFF::AIFF::File "free_taglib_riff_aiff_file";
 
 // Ignore IOStream and all the constructors using it.
 %ignore IOStream;
+%ignore TagLib::RIFF::AIFF::File::File(IOStream *, bool, Properties::ReadStyle, ID3v2::FrameFactory *);
 %ignore TagLib::RIFF::AIFF::File::File(IOStream *, bool, Properties::ReadStyle);
 %ignore TagLib::RIFF::AIFF::File::File(IOStream *, bool);
 %ignore TagLib::RIFF::AIFF::File::File(IOStream *);
+%ignore TagLib::RIFF::AIFF::File::isSupported(IOStream *);
 
 // Ignore the unified property interface.
 %ignore TagLib::RIFF::AIFF::File::properties;