[med-svn] [Git][med-team/praat][master] 2 commits: Read Vorbis file in unit test

[Rafael Laboissière (@rafael)]

Rafael Laboissière pushed to branch master at Debian Med / praat


Commits:
f1d3b213 by Rafael Laboissière at 2021-08-18T10:56:37-03:00
Read Vorbis file in unit test

+ d/p/disable-read-vorbis-file.patch: Drop patch
+ d/p/read-vorbis-file-32-bit.patch: New patch

Gbp-Dch: Full

- - - - -
31ef5ddd by Rafael Laboissière at 2021-08-18T15:09:20-03:00
Changelog entry for version 6.1.51-3

Gbp-Dch: Ignore

- - - - -


4 changed files:

- debian/changelog
- − debian/patches/disable-read-vorbis-file.patch
- + debian/patches/read-vorbis-file-32-bit.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+praat (6.1.51-3) unstable; urgency=medium
+
+  * Read Vorbis file in unit test
+    + d/p/disable-read-vorbis-file.patch: Drop patch
+    + d/p/read-vorbis-file-32-bit.patch: New patch
+
+ -- Rafael Laboissière <rafael at debian.org>  Wed, 18 Aug 2021 11:03:57 -0300
+
 praat (6.1.51-2) unstable; urgency=medium
 
   * Upload to unstable (really, closes: #984296)


=====================================
debian/patches/disable-read-vorbis-file.patch deleted
=====================================
@@ -1,24 +0,0 @@
-Description: Disable the reading of OGG Vorbis file in unit test
- Without this patch, the unit test dwtest/test_readAudioFiles.praat
- hangs forever on the i386 architecture.
-Author: Rafael Laboissière <rafael at debian.org>
-Bug: https://github.com/praat/praat/issues/1734
-Forwarded: not-needed
-Last-Update: 2021-08-15
-
---- praat-6.1.51.orig/dwtest/test_readAudioFiles.praat
-+++ praat-6.1.51/dwtest/test_readAudioFiles.praat
-@@ -3,9 +3,10 @@
- 
- # ogg vorbis
- appendInfoLine: "test_readAudioFiles.praat"
--appendInfoLine: tab$, "Read vorbis audio from ogg file"
--vorbis  = Read from file: "Example_vorbis_audio.ogg"
-+#appendInfoLine: tab$, "Read vorbis audio from ogg file"
-+#vorbis  = Read from file: "Example_vorbis_audio.ogg"
- appendInfoLine: tab$, "Read opus audio from ogg file "
- opus = Read from file: "Example_opus_audio.ogg"
--removeObject: vorbis, opus
-+#removeObject: vorbis, opus
-+removeObject: opus
- appendInfoLine: "test_readAudioFiles.praat OK"


=====================================
debian/patches/read-vorbis-file-32-bit.patch
=====================================
@@ -0,0 +1,19 @@
+Description: Get rid of crash when reading Vorbis files on 32-bit platforms
+Author: Paul Boersma <paul.boersma at uva.nl>
+Origin: upstream, https://github.com/praat/praat/commit/c80187cafb31d0bae7b1ce18b4a236dbe572de22
+Bug: https://github.com/praat/praat/issues/1734
+Forwarded: not-needed
+Reviewed-By: Rafael Laboissière <rafael at debian.org>
+Last-Update: 2021-08-18
+
+--- praat-6.1.51.orig/external/vorbis/vorbisfile.h
++++ praat-6.1.51/external/vorbis/vorbisfile.h
+@@ -55,7 +55,7 @@ typedef struct {
+ 
+ static ov_callbacks OV_CALLBACKS_NOCLOSE = {
+   (size_t (*)(void *, size_t, size_t, void *))  fread,
+-  (int (*)(void *, ogg_int64_t, int))           fseek,
++  (int (*)(void *, ogg_int64_t, int))           fseeko,
+   (int (*)(void *))                             nullptr,
+   (long (*)(void *))                            ftell
+ };


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
 use-ldflags.patch
 cross-build.patch
 dwtest-random-seed.patch
-disable-read-vorbis-file.patch
+read-vorbis-file-32-bit.patch



View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/3c5360f2e6250a2533ee6f4b17d04e8d4300e03f...31ef5ddd4d554c6c7e68306f359e60d06d67c898

-- 
View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/3c5360f2e6250a2533ee6f4b17d04e8d4300e03f...31ef5ddd4d554c6c7e68306f359e60d06d67c898
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210818/43aa34bc/attachment-0001.htm>