* [PR PATCH] libsndfile: update to 1.2.0
@ 2022-12-25 18:10 lun-4
2023-01-14 0:53 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 1 reply; 2+ messages in thread
From: lun-4 @ 2022-12-25 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 698 bytes --]
There is a new pull request by lun-4 against master on the void-packages repository
https://github.com/lun-4/void-packages libsndfile-update-1-2-0
https://github.com/void-linux/void-packages/pull/41289
libsndfile: update to 1.2.0
Less than a day after 1.1.0's merge, 1.2.0 is released, I suppose it's a Christmas gift to me :P
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/41289.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libsndfile-update-1-2-0-41289.patch --]
[-- Type: text/x-diff, Size: 4934 bytes --]
From 77d149e3edf35fb6469302160f3d741eb48a43ae Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Sun, 25 Dec 2022 15:02:27 -0300
Subject: [PATCH] libsndfile: update to 1.2.0
---
.../patches/identify-naked-mpeg-last.patch | 73 -------------------
srcpkgs/libsndfile/template | 4 +-
2 files changed, 2 insertions(+), 75 deletions(-)
delete mode 100644 srcpkgs/libsndfile/patches/identify-naked-mpeg-last.patch
diff --git a/srcpkgs/libsndfile/patches/identify-naked-mpeg-last.patch b/srcpkgs/libsndfile/patches/identify-naked-mpeg-last.patch
deleted file mode 100644
index a817a7e41b12..000000000000
--- a/srcpkgs/libsndfile/patches/identify-naked-mpeg-last.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Author: Arthur Taylor <art@ified.ca>
-Reason: The minimal possible MPEG file contains no headers or identification
-other than the brief sync header. This header is only 3 bytes, and is quite
-prone to false-positives. Particularly raw PCM can look like a sync header.
-
-As such, move detection of 'naked' MPEG files in guess_file_type()
-to the very last test. Give more weight to a sync header if it
-follows an ID3 tag.
-
-See https://github.com/libsndfile/libsndfile/pull/898
-Upstream: yes
---- a/src/sndfile.c
-+++ b/src/sndfile.c
-@@ -2771,6 +2771,17 @@ format_from_extension (SF_PRIVATE *psf)
- return format ;
- } /* format_from_extension */
-
-+static int
-+identify_mpeg (uint32_t marker)
-+{ if ((marker & MAKE_MARKER (0xFF, 0xE0, 0, 0)) == MAKE_MARKER (0xFF, 0xE0, 0, 0) && /* Frame sync */
-+ (marker & MAKE_MARKER (0, 0x18, 0, 0)) != MAKE_MARKER (0, 0x08, 0, 0) && /* Valid MPEG version */
-+ (marker & MAKE_MARKER (0, 0x06, 0, 0)) != MAKE_MARKER (0, 0, 0, 0) && /* Valid layer description */
-+ (marker & MAKE_MARKER (0, 0, 0xF0, 0)) != MAKE_MARKER (0, 0, 0xF0, 0) && /* Valid bitrate */
-+ (marker & MAKE_MARKER (0, 0, 0x0C, 0)) != MAKE_MARKER (0, 0, 0x0C, 0)) /* Valid samplerate */
-+ return SF_FORMAT_MPEG ;
-+ return 0 ;
-+} /* identify_mpeg */
-+
- static int
- guess_file_type (SF_PRIVATE *psf)
- { uint32_t buffer [3], format ;
-@@ -2872,13 +2883,6 @@ guess_file_type (SF_PRIVATE *psf)
- if (buffer [0] == MAKE_MARKER ('R', 'F', '6', '4') && buffer [2] == MAKE_MARKER ('W', 'A', 'V', 'E'))
- return SF_FORMAT_RF64 ;
-
-- if ((buffer [0] & MAKE_MARKER (0xFF, 0xE0, 0, 0)) == MAKE_MARKER (0xFF, 0xE0, 0, 0) && /* Frame sync */
-- (buffer [0] & MAKE_MARKER (0, 0x18, 0, 0)) != MAKE_MARKER (0, 0x08, 0, 0) && /* Valid MPEG version */
-- (buffer [0] & MAKE_MARKER (0, 0x06, 0, 0)) != MAKE_MARKER (0, 0, 0, 0) && /* Valid layer description */
-- (buffer [0] & MAKE_MARKER (0, 0, 0xF0, 0)) != MAKE_MARKER (0, 0, 0xF0, 0) && /* Valid bitrate */
-- (buffer [0] & MAKE_MARKER (0, 0, 0x0C, 0)) != MAKE_MARKER (0, 0, 0x0C, 0)) /* Valid samplerate */
-- return SF_FORMAT_MPEG ;
--
- if (buffer [0] == MAKE_MARKER ('I', 'D', '3', 2) || buffer [0] == MAKE_MARKER ('I', 'D', '3', 3)
- || buffer [0] == MAKE_MARKER ('I', 'D', '3', 4))
- { psf_log_printf (psf, "Found 'ID3' marker.\n") ;
-@@ -2887,6 +2891,10 @@ guess_file_type (SF_PRIVATE *psf)
- return 0 ;
- } ;
-
-+ /* ID3v2 tags + MPEG */
-+ if (psf->id3_header.len > 0 && (format = identify_mpeg (buffer [0])) != 0)
-+ return format ;
-+
- /* Turtle Beach SMP 16-bit */
- if (buffer [0] == MAKE_MARKER ('S', 'O', 'U', 'N') && buffer [1] == MAKE_MARKER ('D', ' ', 'S', 'A'))
- return 0 ;
-@@ -2898,10 +2906,16 @@ guess_file_type (SF_PRIVATE *psf)
- if (buffer [0] == MAKE_MARKER ('a', 'j', 'k', 'g'))
- return 0 /*-SF_FORMAT_SHN-*/ ;
-
-- /* This must be the last one. */
-+ /* This must be (almost) the last one. */
- if (psf->filelength > 0 && (format = try_resource_fork (psf)) != 0)
- return format ;
-
-+ /* MPEG with no ID3v2 tags. Only have the MPEG sync header for
-+ * identification and it is quite brief, and prone to false positives.
-+ * Check for this last, even after resource forks. */
-+ if (psf->id3_header.len == 0 && (format = identify_mpeg (buffer [0])) != 0)
-+ return format ;
-+
- return 0 ;
- } /* guess_file_type */
diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template
index 3ffbe1026e4c..728ced9a39aa 100644
--- a/srcpkgs/libsndfile/template
+++ b/srcpkgs/libsndfile/template
@@ -1,6 +1,6 @@
# Template file for 'libsndfile'
pkgname=libsndfile
-version=1.1.0
+version=1.2.0
revision=1
build_style=gnu-configure
configure_args="--enable-static"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
homepage="https://libsndfile.github.io/libsndfile/"
changelog="https://github.com/libsndfile/libsndfile/raw/master/CHANGELOG.md"
distfiles="https://github.com/libsndfile/libsndfile/releases/download/${version}/libsndfile-${version}.tar.xz"
-checksum=0f98e101c0f7c850a71225fb5feaf33b106227b3d331333ddc9bacee190bcf41
+checksum=0e30e7072f83dc84863e2e55f299175c7e04a5902ae79cfb99d4249ee8f6d60a
libsndfile-progs_package() {
short_desc+=" - bundled cmdline apps"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: libsndfile: update to 1.2.0
2022-12-25 18:10 [PR PATCH] libsndfile: update to 1.2.0 lun-4
@ 2023-01-14 0:53 ` classabbyamp
0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2023-01-14 0:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
There's a merged pull request on the void-packages repository
libsndfile: update to 1.2.0
https://github.com/void-linux/void-packages/pull/41289
Description:
Less than a day after 1.1.0's merge, 1.2.0 is released, I suppose it's a Christmas gift to me :P
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl (cross)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-14 0:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-25 18:10 [PR PATCH] libsndfile: update to 1.2.0 lun-4
2023-01-14 0:53 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).