Hello community, here is the log from the commit of package getdata for openSUSE:Factory checked in at 2016-09-12 13:26:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/getdata (Old) and /work/SRC/openSUSE:Factory/.getdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "getdata" Changes: -------- --- /work/SRC/openSUSE:Factory/getdata/getdata.changes 2016-07-28 23:47:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.getdata.new/getdata.changes 2016-09-12 13:26:47.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Sep 8 20:33:08 UTC 2016 - [email protected] + +- update to 0.9.4 + for all relevant changes see + https://sourceforge.net/projects/getdata/files/getdata/0.9.4/ + * BUG FIX: Arbitrarily-long reads of FLAC-encoded files now work. + Previously, each FLAC frame was written to the start of the + output buffer, overwriting the previous frame, and leaving most + of the buffer uninitialised. Reported by S. J. Benton. + * BUG FIX: Data read from FLAC-encoded 1-byte types are now correct. + Previously, although all data requested was read, only the first + half would be returned, encoded as 16-bit data (i.e., with a + zero-byte between every sample). + +------------------------------------------------------------------- Old: ---- getdata-0.9.3.tar.xz New: ---- getdata-0.9.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ getdata.spec ++++++ --- /var/tmp/diff_new_pack.qNaOu9/_old 2016-09-12 13:26:48.000000000 +0200 +++ /var/tmp/diff_new_pack.qNaOu9/_new 2016-09-12 13:26:48.000000000 +0200 @@ -18,7 +18,7 @@ Name: getdata -Version: 0.9.3 +Version: 0.9.4 Release: 0 Summary: Library for reading and writing dirfile data License: LGPL-2.1+ ++++++ getdata-0.9.3.tar.xz -> getdata-0.9.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/ChangeLog new/getdata-0.9.4/ChangeLog --- old/getdata-0.9.3/ChangeLog 2016-07-20 23:42:09.000000000 +0200 +++ new/getdata-0.9.4/ChangeLog 2016-09-08 01:21:54.000000000 +0200 @@ -1,3 +1,40 @@ +2016-09-07 D. V. Wiebe <[email protected]> svn:1097 + GetData-0.9.4 released. + + * doc/README.python doc/README.php: Update for PHP7/Py3. + + * bindings/python/pyentry.c (gdpy_set_entry_from_tuple): Fix printf format. + +2016-09-01 D. V. Wiebe <[email protected]> svn:1096 + * src/flac.c (_GD_FlacOutput): Skip pointless memcpy when ns == 0. + * src/flac.c (_GD_FlacRead): Advance output after write. + * test/flac_get_long.c: Added. + + * src/flac.c (_GD_FlacWriteCallback): Fix 1-byte data type check. + * test/flac_get_int8.c: Added. + + * test/flac_get_int64.c: Added. + + * m4/python.m4 (GD_PYTHON): Do the standard strip-exec_prefix-after-the- + fact thing with the pythondir to work around the debianification of + distutils in debian. + +2016-08-17 D. V. Wiebe <[email protected]> svn:1095 + * m4/python.m4: Add some superfluous exec's to work around a + bug in bash-4.1. + + * bindings/python/gdpy_intern.h (gdpy_path_from_pyobj): Fix Python3 + definition. + + * bindings/python/pyentry.c (gdpy_entry_setspf gdpy_entry_setbitnum + gdpy_entry_setshift gdpy_entry_setcountval gdpy_entry_setthreshold): + initialise scalar to suppress compiler warning. + + * bindings/python/test/big_test.py bindings/python/test/char_enc1.py + bindings/python/test/char_enc2.py bindings/python/test/char_enc3.py: Fix + all the encodings for Python3. Use os.fsdecode in Python3 for filename + checks. + 2016-07-20 D. V. Wiebe <[email protected]> svn:1091 GetData-0.9.3 released. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/NEWS new/getdata-0.9.4/NEWS --- old/getdata-0.9.3/NEWS 2016-07-20 23:04:04.000000000 +0200 +++ new/getdata-0.9.4/NEWS 2016-09-08 01:04:46.000000000 +0200 @@ -1,14 +1,35 @@ -New in version 0.9.3: +New in version 0.9.4: - API Changes: + Library Changes: - * gd_verbose_prefix() can now be used on invalid dirfiles. Previously, - this function would return GD_E_BAD_DIRFILE when passed an invalid - DIRFILE pointer. + * BUG FIX: Arbitrarily-long reads of FLAC-encoded files now work. + Previously, each FLAC frame was written to the start of the output + buffer, overwriting the previous frame, and leaving most of the + buffer uninitialised. Reported by S. J. Benton. + + * BUG FIX: Data read from FLAC-encoded 1-byte types are now correct. + Previously, although all data requested was read, only the first half + would be returned, encoded as 16-bit data (i.e., with a zero-byte + between every sample). - * BUG FIX: When trying to access a LINTERP table file in a non-existent - directory, GetData now reports the correct error (No such file or - directory). Reported by Johanna Nagy. + Bindings Changes: + + * PYTHON BUG FIX: An erroreous preprocessor definition which made the + Python bindings unbuildable for Python 3 has been fixed. Reported by + Akito Kusaka. + + Miscellaneous: + + * A work-around has been implemented in the configure script to avoid a + bug in bash 4.1's parser. Reported by Akito Kusaka. + + * The way configure decides the Python module path has changed slightly + to provide a better default under debian-based systems when using + debhelper. Reported by S. J. Benton. + +|=========================================================================| + +New in version 0.9.3: Library Changes: @@ -27,6 +48,16 @@ * BUG FIX: On platforms where char is signed, the library no longer rejects field names containing bytes with the top bit set. + API Changes: + + * gd_verbose_prefix() can now be used on invalid dirfiles. Previously, + this function would return GD_E_BAD_DIRFILE when passed an invalid + DIRFILE pointer. + + * BUG FIX: When trying to access a LINTERP table file in a non-existent + directory, GetData now reports the correct error (No such file or + directory). Reported by Johanna Nagy. + Bindings Changes: * PHP: PHP7 support has been added. @@ -1053,7 +1084,7 @@ these fields' metadata caches or else change the name in those definitions as well. - * BUG FIX: The invalid syntax "/META parent/child granchild ..." is now + * BUG FIX: The invalid syntax "/META parent/child grandchild ..." is now properly rejected by the parser. Previously it half-worked, resulting in a segfault in gd_close(). @@ -1387,7 +1418,7 @@ computes A/X for vector X and scalar A, and CARRAY, which is an array of CONST scalars. A few other changes are listed below. - * Like CONST fields, CARRAY elements can be used as parametersin the + * Like CONST fields, CARRAY elements can be used as parameters in the definition of other fields. Syntax is 'field<n>', where 'field' is the field name and 'n' the element index in the CARRAY (and the angle brackets are literal angle brackets). If the '<n>' is omitted, the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/bindings/matlab/getdata_constants.m new/getdata-0.9.4/bindings/matlab/getdata_constants.m --- old/getdata-0.9.3/bindings/matlab/getdata_constants.m 2016-06-28 04:36:37.000000000 +0200 +++ new/getdata-0.9.4/bindings/matlab/getdata_constants.m 2016-09-02 04:11:16.000000000 +0200 @@ -31,7 +31,7 @@ % See also GETDATA GD = struct(... - 'VERSION', '0.9.3a', ... + 'VERSION', '0.9.4a', ... 'E_OK', int32(0), ... 'E_FORMAT', int32(2), ... 'E_CREAT', int32(4), ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/bindings/python/gdpy_intern.h new/getdata-0.9.4/bindings/python/gdpy_intern.h --- old/getdata-0.9.3/bindings/python/gdpy_intern.h 2016-05-12 04:37:42.000000000 +0200 +++ new/getdata-0.9.4/bindings/python/gdpy_intern.h 2016-08-16 04:01:58.000000000 +0200 @@ -188,7 +188,7 @@ #define gdpyobj_from_path PyString_FromString #else extern char *gdpy_path_from_pyobj_(PyObject*, int); -#define gdpy_path_from_pyobj(o,c,d) gdpy_path_from_pyobj_(o,d) +#define gdpy_path_from_pyobj(o,c) gdpy_path_from_pyobj_(o,1) #define gdpyobj_from_path PyUnicode_DecodeFSDefault #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/bindings/python/pyentry.c new/getdata-0.9.4/bindings/python/pyentry.c --- old/getdata-0.9.3/bindings/python/pyentry.c 2016-05-25 23:02:03.000000000 +0200 +++ new/getdata-0.9.4/bindings/python/pyentry.c 2016-09-08 00:47:38.000000000 +0200 @@ -196,8 +196,7 @@ size = PyTuple_Size(tuple); if (size < min) { PyErr_Format(PyExc_TypeError, "'pygetdata.entry' " - "%s: needed %d entry parameters, but got only %" PRIdSIZE, - name, min, size); + "%s: needed %d entry parameters, but got only %li", name, min, size); dreturnvoid(); return; } @@ -1151,7 +1150,7 @@ void *closure) { unsigned int spf = 0; - char *scalar; + char *scalar = NULL; dtrace("%p, %p, %p", self, value, closure); @@ -1587,7 +1586,7 @@ void *closure) { int bitnum = 0; - char *scalar; + char *scalar = NULL; dtrace("%p, %p, %p", self, value, closure); if (self->E->field_type != GD_BIT_ENTRY && @@ -1768,7 +1767,7 @@ void *closure) { int64_t shift = 0; - char *scalar; + char *scalar = NULL; dtrace("%p, %p, %p", self, value, closure); @@ -1819,7 +1818,7 @@ void *closure) { int count_val = 0; - char *scalar; + char *scalar = NULL; dtrace("%p, %p, %p", self, value, closure); @@ -2334,7 +2333,7 @@ void *closure) { gd_triplet_t t; - char *scalar; + char *scalar = NULL; dtrace("%p, %p, %p", self, value, closure); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/bindings/python/test/big_test.py new/getdata-0.9.4/bindings/python/test/big_test.py --- old/getdata-0.9.3/bindings/python/test/big_test.py 2016-04-28 22:06:55.000000000 +0200 +++ new/getdata-0.9.4/bindings/python/test/big_test.py 2016-08-16 04:13:22.000000000 +0200 @@ -346,7 +346,7 @@ n = d.getdata("x", pygetdata.INT, first_frame=5, num_frames=1) except: CheckException(38,pygetdata.BadCodeError) - CheckSimple(38,d.error_string,"Field not found: x") + CheckSimple(38,d.error_string,B("Field not found: x")) # 40: entry (raw) check try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/bindings/python/test/char_enc1.py new/getdata-0.9.4/bindings/python/test/char_enc1.py --- old/getdata-0.9.3/bindings/python/test/char_enc1.py 2016-04-20 17:57:19.000000000 +0200 +++ new/getdata-0.9.4/bindings/python/test/char_enc1.py 2016-08-17 23:45:52.000000000 +0200 @@ -27,6 +27,24 @@ # Python2/3 abstraction: +# a unicode character +def C(c): + if sys.version[:1] == '3': + return chr(c) + return unichr(c) + +# an encoded character (byte) +def E(c): + if sys.version[:1] == '3': + return bytes([c]) + return chr(c) + +# a filesystem decoded string +def F(s): + if sys.version[:1] == '3': + return os.fsdecode(s) + return s + # an encoded string def B(s): if sys.version[:1] == '3': @@ -54,7 +72,7 @@ def CheckEOS(t,v,g): global ne - if (U(v)[-len(U(g)):] != U(g)): + if (v[-len(g):] != g): ne+=1 print ("n[", t, "] =", repr(v), "expected", repr(g)) @@ -63,14 +81,17 @@ os.mkdir("dirfile") # Encoded string (koi8-r) -estring = B('\xF3\xD4\xD2\xCF\xCB\xC1') +estring = E(0xF3) + E(0xD4) + E(0xD2) + E(0xCF) + E(0xCB) + E(0xC1) + +# Filesystem *decoded* string +fstring = F(estring) # byte-escaped (used for Dirfile metadata) xstring = B('\\xF3\\xD4\\xD2\\xCF\\xCB\\xC1') # The decoded version -ustring = unichr(0x421) + unichr(0x442) + unichr(0x440) + unichr(0x43E) + \ - unichr(0x43A) + unichr(0x430) +ustring = C(0x421) + C(0x442) + C(0x440) + C(0x43E) + \ + C(0x43A) + C(0x430) # Unicode escaped, which will show up in ASCII-ified error messages xustring = B("\\u0421\\u0442\\u0440\\u043e\\u043a\\u0430") @@ -85,6 +106,7 @@ xstring + B("_c1 CONST UINT8 1\n") + xstring + B("_c2 CONST UINT8 1\n") + xstring + B("_r1 RAW UINT8 ") + xstring + B("_spf\n") + + B("r2 RAW UINT8 ") + xstring + B("_spf\n") + B("l1 LINTERP in ") + xstring + B("\n") + B("l1/") + xstring + B("_s1 STRING ") + xstring + B("1\n") + B("l1/") + xstring + B("_s2 STRING ") + xstring + B("2\n") + @@ -179,7 +201,7 @@ CheckSimple(30,c.parameters,(1, ustring + "_spf")) c = D.entry("l1") -CheckSimple(31,c.parameters,("in", estring)) +CheckSimple(31,c.parameters,("in", fstring)) c = D.entry("d1") CheckSimple(32,c.in_fields,(ustring + "_i1", ustring + "_i2")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/bindings/python/test/char_enc2.py new/getdata-0.9.4/bindings/python/test/char_enc2.py --- old/getdata-0.9.3/bindings/python/test/char_enc2.py 2016-04-21 01:30:14.000000000 +0200 +++ new/getdata-0.9.4/bindings/python/test/char_enc2.py 2016-08-17 23:45:55.000000000 +0200 @@ -27,12 +27,24 @@ # Python2/3 abstraction: +# an encoded character (byte) +def E(c): + if sys.version[:1] == '3': + return bytes([c]) + return chr(c) + # an encoded string def B(s): if sys.version[:1] == '3': return bytes(s, "UTF-8") return s +# a filesystem decoded string +def F(s): + if sys.version[:1] == '3': + return os.fsdecode(s) + return s + # a decoded string def U(s): if sys.version[:1] == '3': @@ -63,18 +75,14 @@ os.mkdir("dirfile") # Encoded string (koi8-r) -estring = B('\xF3\xD4\xD2\xCF\xCB\xC1') +estring = E(0xF3) + E(0xD4) + E(0xD2) + E(0xCF) + E(0xCB) + E(0xC1) + +# Filesystem *decoded* string +fstring = F(estring) # byte-escaped (used for Dirfile metadata) xstring = B('\\xF3\\xD4\\xD2\\xCF\\xCB\\xC1') -# The decoded version -ustring = unichr(0x421) + unichr(0x442) + unichr(0x440) + unichr(0x43E) + \ - unichr(0x43A) + unichr(0x430) - -# Unicode escaped, which will show up in ASCII-ified error messages -xestring = B("\\u0421\\u0442\\u0440\\u043e\\u043a\\u0430") - f=open("dirfile/format", "wb") f.write( B("/ALIAS ") + xstring + B("_al ") + xstring + B("_t\n") + @@ -129,108 +137,108 @@ c = D.carrays(return_type=pygetdata.NULL) CheckSimple(3,len(c),2) -CheckSimple(4,c[0][0],estring + "_a1") -CheckSimple(5,c[1][0],estring + "_a2") +CheckSimple(4,c[0][0],estring + B("_a1")) +CheckSimple(5,c[1][0],estring + B("_a2")) c = D.constants(return_type=pygetdata.UINT8) CheckSimple(6,len(c),2) -CheckSimple(7,c[0][0],estring + "_c1") -CheckSimple(8,c[1][0],estring + "_c2") +CheckSimple(7,c[0][0],estring + B("_c1")) +CheckSimple(8,c[1][0],estring + B("_c2")) c = D.mcarrays("l1", return_type=pygetdata.NULL) CheckSimple(9,len(c),2) -CheckSimple(10,c[0][0], estring + "_a1") -CheckSimple(11,c[1][0], estring + "_a2") +CheckSimple(10,c[0][0], estring + B("_a1")) +CheckSimple(11,c[1][0], estring + B("_a2")) c = D.mconstants("l1", return_type=pygetdata.UINT8) CheckSimple(12,len(c),2) -CheckSimple(13,c[0][0], estring + "_c1") -CheckSimple(14,c[1][0], estring + "_c2") +CheckSimple(13,c[0][0], estring + B("_c1")) +CheckSimple(14,c[1][0], estring + B("_c2")) c = D.strings() CheckSimple(15,len(c),2) -CheckSimple(16,c[0][0], estring + "_s1") -CheckSimple(17,c[0][1], estring + "1") -CheckSimple(18,c[0][0], estring + "_s1") -CheckSimple(19,c[1][1], estring + "2") +CheckSimple(16,c[0][0], estring + B("_s1")) +CheckSimple(17,c[0][1], estring + B("1")) +CheckSimple(18,c[0][0], estring + B("_s1")) +CheckSimple(19,c[1][1], estring + B("2")) c = D.mstrings("l1") CheckSimple(20,len(c),2) -CheckSimple(21,c[0][0], estring + "_s1") -CheckSimple(22,c[0][1], estring + "1") -CheckSimple(23,c[0][0], estring + "_s1") -CheckSimple(24,c[1][1], estring + "2") +CheckSimple(21,c[0][0], estring + B("_s1")) +CheckSimple(22,c[0][1], estring + B("1")) +CheckSimple(23,c[0][0], estring + B("_s1")) +CheckSimple(24,c[1][1], estring + B("2")) c = D.reference -CheckSimple(25,c,estring + "_r1") +CheckSimple(25,c,estring + B("_r1")) -c = D.get_string(estring + "_s1") -CheckSimple(26,c,estring + "1") +c = D.get_string(estring + B("_s1")) +CheckSimple(26,c,estring + B("1")) -c = D.alias_target(estring + "_al") -CheckSimple(27,c,estring + "_t") +c = D.alias_target(estring + B("_al")) +CheckSimple(27,c,estring + B("_t")) -c = D.entry(estring + "_r1") -CheckSimple(28,c.name,estring + "_r1") -CheckSimple(29,c.spf,estring + "_spf") -CheckSimple(30,c.parameters,(1, estring + "_spf")) +c = D.entry(estring + B("_r1")) +CheckSimple(28,c.name,estring + B("_r1")) +CheckSimple(29,c.spf,estring + B("_spf")) +CheckSimple(30,c.parameters,(1, estring + B("_spf"))) c = D.entry("l1") -CheckSimple(31,c.parameters,("in", estring)) +CheckSimple(31,c.parameters,(B("in"), fstring)) c = D.entry("d1") -CheckSimple(32,c.in_fields,(estring + "_i1", estring + "_i2")) -CheckSimple(33,c.parameters,(estring + "_i1", estring + "_i2")) +CheckSimple(32,c.in_fields,(estring + B("_i1"), estring + B("_i2"))) +CheckSimple(33,c.parameters,(estring + B("_i1"), estring + B("_i2"))) c = D.entry("e1") -CheckSimple(35,c.dividend,estring + "_dv") -CheckSimple(36,c.parameters,("in", estring + "_dv")) +CheckSimple(35,c.dividend,estring + B("_dv")) +CheckSimple(36,c.parameters,(B("in"), estring + B("_dv"))) c = D.entry("p1") -CheckSimple(37,c.in_fields,(estring + "_i",)) -CheckSimple(38,c.shift,estring + "_ps") -CheckSimple(39,c.parameters,(estring + "_i", estring + "_ps")) +CheckSimple(37,c.in_fields,(estring + B("_i"),)) +CheckSimple(38,c.shift,estring + B("_ps")) +CheckSimple(39,c.parameters,(estring + B("_i"), estring + B("_ps"))) c = D.entry("y1") -CheckSimple(40,c.a,(estring + "_y1", 2, estring + "_y3")) -CheckSimple(41,c.parameters,(estring + "_i", - (estring + "_y1", 2, estring + "_y3"))) +CheckSimple(40,c.a,(estring + B("_y1"), 2, estring + B("_y3"))) +CheckSimple(41,c.parameters,(estring + B("_i"), + (estring + B("_y1"), 2, estring + B("_y3")))) c = D.entry("o1") -CheckSimple(42,c.in_fields,(estring + "_i",)) -CheckSimple(43,c.m,(estring + "_m",)) -CheckSimple(44,c.b,(estring + "_b",)) -CheckSimple(45,c.parameters,((estring + "_i",), (estring + "_m",), - (estring + "_b",))) +CheckSimple(42,c.in_fields,(estring + B("_i"),)) +CheckSimple(43,c.m,(estring + B("_m"),)) +CheckSimple(44,c.b,(estring + B("_b"),)) +CheckSimple(45,c.parameters,((estring + B("_i"),), (estring + B("_m"),), + (estring + B("_b"),))) c = D.entry("o2") -CheckSimple(46,c.in_fields,(estring + "_i1",estring + "_i2")) -CheckSimple(47,c.m,(estring + "_m1",estring + "_m2")) -CheckSimple(48,c.b,(estring + "_b1",estring + "_b2")) -CheckSimple(49,c.parameters,((estring + "_i1",estring + "_i2"), - (estring + "_m1",estring + "_m2"),(estring + "_b1",estring + "_b2"))) +CheckSimple(46,c.in_fields,(estring + B("_i1"),estring + B("_i2"))) +CheckSimple(47,c.m,(estring + B("_m1"),estring + B("_m2"))) +CheckSimple(48,c.b,(estring + B("_b1"),estring + B("_b2"))) +CheckSimple(49,c.parameters,((estring + B("_i1"),estring + B("_i2")), + (estring + B("_m1"),estring + B("_m2")),(estring + B("_b1"),estring + B("_b2")))) c = D.entry("o3") -CheckSimple(50,c.in_fields,(estring + "_i1",estring + "_i2",estring + "_i3")) -CheckSimple(51,c.m,(estring + "_m1",estring + "_m2",estring + "_m3")) -CheckSimple(52,c.b,(estring + "_b1",estring + "_b2",estring + "_b3")) -CheckSimple(53,c.parameters,((estring + "_i1",estring + "_i2",estring + "_i3"), - (estring + "_m1",estring + "_m2",estring + "_m3"), - (estring + "_b1",estring + "_b2",estring + "_b3"))) +CheckSimple(50,c.in_fields,(estring + B("_i1"),estring + B("_i2"),estring + B("_i3"))) +CheckSimple(51,c.m,(estring + B("_m1"),estring + B("_m2"),estring + B("_m3"))) +CheckSimple(52,c.b,(estring + B("_b1"),estring + B("_b2"),estring + B("_b3"))) +CheckSimple(53,c.parameters,((estring + B("_i1"),estring + B("_i2"),estring + B("_i3")), + (estring + B("_m1"),estring + B("_m2"),estring + B("_m3")), + (estring + B("_b1"),estring + B("_b2"),estring + B("_b3")))) c = D.entry("w1") -CheckSimple(54,c.parameters,("a", "b", pygetdata.WINDOP_EQ, estring + "_t1")) +CheckSimple(54,c.parameters,(B("a"), B("b"), pygetdata.WINDOP_EQ, estring + B("_t1"))) c = D.entry("w2") -CheckSimple(55,c.parameters,("a", "b", pygetdata.WINDOP_SET, estring + "_t2")) +CheckSimple(55,c.parameters,(B("a"), B("b"), pygetdata.WINDOP_SET, estring + B("_t2"))) c = D.entry("w3") -CheckSimple(56,c.parameters,("a", "b", pygetdata.WINDOP_GT, estring + "_t3")) +CheckSimple(56,c.parameters,(B("a"), B("b"), pygetdata.WINDOP_GT, estring + B("_t3"))) c = D.entry("m1") -CheckSimple(57,c.count_val, estring + "_cv") -CheckSimple(58,c.period, estring + "_pd") -CheckSimple(59,c.parameters,("a", "b", estring + "_cv", estring + "_pd")) +CheckSimple(57,c.count_val, estring + B("_cv")) +CheckSimple(58,c.period, estring + B("_pd")) +CheckSimple(59,c.parameters,(B("a"), B("b"), estring + B("_cv"), estring + B("_pd"))) D.discard() del D diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/bindings/python/test/char_enc3.py new/getdata-0.9.4/bindings/python/test/char_enc3.py --- old/getdata-0.9.3/bindings/python/test/char_enc3.py 2016-04-21 04:41:37.000000000 +0200 +++ new/getdata-0.9.4/bindings/python/test/char_enc3.py 2016-08-17 23:44:09.000000000 +0200 @@ -27,12 +27,24 @@ # Python2/3 abstraction: +# an encoded character (byte) +def E(c): + if sys.version[:1] == '3': + return bytes([c]) + return chr(c) + # an encoded string def B(s): if sys.version[:1] == '3': return bytes(s, "UTF-8") return s +# a filesystem decoded string +def F(s): + if sys.version[:1] == '3': + return os.fsdecode(s) + return s + # a decoded string def U(s): if sys.version[:1] == '3': @@ -91,14 +103,14 @@ os.mkdir("dirfile") # Encoded string (koi8-r) -estring = B('\xF3\xD4\xD2\xCF\xCB\xC1') +estring = E(0xF3) + E(0xD4) + E(0xD2) + E(0xCF) + E(0xCB) + E(0xC1) + +# Filesystem *decoded* string +fstring = F(estring) # byte-escaped (used for Dirfile metadata) xstring = B('\\xF3\\xD4\\xD2\\xCF\\xCB\\xC1') -# Unicode escaped, which will show up in ASCII-ified error messages -xustring = B("\\u0421\\u0442\\u0440\\u043e\\u043a\\u0430") - f=open("dirfile/format", "wb") f.write( B("/ALIAS ") + xstring + B("_al ") + xstring + B("_t\n") + @@ -221,7 +233,7 @@ try: e = 1 - c = D.alias_target(estring + "_al") + c = D.alias_target(estring + B("_al")) except UnicodeDecodeError: e = 0 @@ -239,7 +251,7 @@ # This works because LINTERP table is FS encoded c = D.entry("l1") -CheckSimple(10,c.parameters,("in", estring)) +CheckSimple(10,c.parameters,("in", fstring)) c = D.entry("d1") CheckIns(11, c) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/configure new/getdata-0.9.4/configure --- old/getdata-0.9.3/configure 2016-07-20 23:25:05.000000000 +0200 +++ new/getdata-0.9.4/configure 2016-09-08 01:23:43.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GetData 0.9.3. +# Generated by GNU Autoconf 2.69 for GetData 0.9.4. # # Report bugs to <[email protected]>. # @@ -598,8 +598,8 @@ # Identity of this package. PACKAGE_NAME='GetData' PACKAGE_TARNAME='getdata' -PACKAGE_VERSION='0.9.3' -PACKAGE_STRING='GetData 0.9.3' +PACKAGE_VERSION='0.9.4' +PACKAGE_STRING='GetData 0.9.4' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://getdata.sourceforge.net/' @@ -1548,7 +1548,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GetData 0.9.3 to adapt to many kinds of systems. +\`configure' configures GetData 0.9.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1618,7 +1618,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GetData 0.9.3:";; + short | recursive ) echo "Configuration of GetData 0.9.4:";; esac cat <<\_ACEOF @@ -1839,7 +1839,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GetData configure 0.9.3 +GetData configure 0.9.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3014,7 +3014,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GetData $as_me 0.9.3, which was +It was created by GetData $as_me 0.9.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3372,7 +3372,7 @@ $as_echo "#define GETDATA_MINOR 9" >>confdefs.h -$as_echo "#define GETDATA_REVISION 3" >>confdefs.h +$as_echo "#define GETDATA_REVISION 4" >>confdefs.h $as_echo "#define GETDATA_VERSION_SUFFIX \"\"" >>confdefs.h @@ -3382,11 +3382,11 @@ GETDATA_MINOR=9 -GETDATA_REVISION=3 +GETDATA_REVISION=4 GETDATA_VERSION_SUFFIX= -GETDATA_LIB_VERSION=0.9.3 +GETDATA_LIB_VERSION=0.9.4 @@ -3398,7 +3398,7 @@ GETDATA_IFACE_VERSION=7 -GETDATA_IMPL_REVISION=3 +GETDATA_IMPL_REVISION=4 GETDATA_IFACE_AGE=0 @@ -4350,7 +4350,7 @@ # Define the identity of the package. PACKAGE='getdata' - VERSION='0.9.3' + VERSION='0.9.4' cat >>confdefs.h <<_ACEOF @@ -4817,9 +4817,9 @@ fi -DEFINE_GD_GETDATA_VERSION="#define GD_GETDATA_VERSION \"0.9.3\"" +DEFINE_GD_GETDATA_VERSION="#define GD_GETDATA_VERSION \"0.9.4\"" -DEFINE_GD_GETDATA_INT_VERSION="#define GD_GETDATA_INT_VERSION `${PRINTF} %i%02i 9 3`" +DEFINE_GD_GETDATA_INT_VERSION="#define GD_GETDATA_INT_VERSION `${PRINTF} %i%02i 9 4`" echo echo "*** Checking host environment" @@ -26176,7 +26176,7 @@ Report bugs to <[email protected]>." lt_cl_version="\ -GetData config.lt 0.9.3 +GetData config.lt 0.9.4 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -32692,7 +32692,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python ABI version" >&5 $as_echo_n "checking Python ABI version... " >&6; } - PYTHON_LDVERSION=$(${PYTHON} - <<EOF 2>/dev/null + PYTHON_LDVERSION=$(exec ${PYTHON} - <<EOF 2>/dev/null try: import sysconfig except ImportError: @@ -32724,7 +32724,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python LDFLAGS" >&5 $as_echo_n "checking Python LDFLAGS... " >&6; } - PYTHON_LIBDIR=$(${PYTHON} - <<EOF 2>/dev/null + PYTHON_LIBDIR=$(exec ${PYTHON} - <<EOF 2>/dev/null try: import sysconfig except ImportError: @@ -32751,18 +32751,28 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python extension module directory" >&5 $as_echo_n "checking Python extension module directory... " >&6; } if test "x${local_python_modpath}" = "x"; then - pythondir=$(${PYTHON} - <<EOF 2>/dev/null + + pyexec_prefix=$exec_prefix + test "x$pyexec_prefix" = xNONE && pyexec_prefix=$prefix + test "x$pyexec_prefix" = xNONE && pyexec_prefix=$ac_default_prefix + + prefixed_pythondir=$(exec ${PYTHON} - <<EOF 2>/dev/null import sys if sys.version[:1] == '3': import sysconfig - print (sysconfig.get_path('platlib', vars={'platbase': '\${exec_prefix}'})) + print (sysconfig.get_path('platlib', vars={'platbase': "${pyexec_prefix}"})) else: from distutils import sysconfig - print (sysconfig.get_python_lib(1,0,prefix='\${exec_prefix}')) + print (sysconfig.get_python_lib(1,0,prefix="${pyexec_prefix}")) EOF ) - if test "x${pythondir}" = "xNone" -o "x${pythondir}" = "x"; then + if test "x${prefixed_pythondir}" = "xNone" -o "x${prefixed_pythondir}" = "x"; + then pythondir='\${exec_prefix}/lib/python${PYTHON_LDVERSION}/site-packages' + else + esc_pyexec_prefix=$(echo ${pyexec_prefix} | ${SED} -e 's/\//\\\//g') + pythondir=$(echo ${prefixed_pythondir} | \ + ${SED} -e "s/^${esc_pyexec_prefix}/\${exec_prefix}/") fi else pythondir=$local_python_modpath @@ -32774,7 +32784,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python object suffix" >&5 $as_echo_n "checking Python object suffix... " >&6; } - PYTHON_OBJECT_SUFFIX=$(${PYTHON} - <<EOF 2>/dev/null + PYTHON_OBJECT_SUFFIX=$(exec ${PYTHON} - <<EOF 2>/dev/null try: import sysconfig except ImportError: @@ -32788,7 +32798,7 @@ if test "x${PYTHON_OBJECT_SUFFIX}" = "xNone"; then - PYTHON_OBJECT_SUFFIX=$(${PYTHON} - <<EOF 2>/dev/null + PYTHON_OBJECT_SUFFIX=$(exec ${PYTHON} - <<EOF 2>/dev/null try: import sysconfig except ImportError: @@ -35549,7 +35559,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GetData $as_me 0.9.3, which was +This file was extended by GetData $as_me 0.9.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -35616,7 +35626,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GetData config.status 0.9.3 +GetData config.status 0.9.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/doc/README.python new/getdata-0.9.4/doc/README.python --- old/getdata-0.9.3/doc/README.python 2015-10-08 03:34:06.000000000 +0200 +++ new/getdata-0.9.4/doc/README.python 2016-09-08 01:14:05.000000000 +0200 @@ -1,13 +1,19 @@ PYTHON BINDINGS FOR GETDATA =========================== -The python bindings consist of a python extension module, `pygetdata.so'. They -should work with Python version 2.3, or any later 2.x version. +The python bindings consist of a python extension module, pygetdata. They +should work with: +* Python2: version 2.4, or later +* Python3: version 3.2, or later Numerical Python (NumPy) is required to build and use the bindings. By default, data returned from the bindings will be returned in NumPy arrays, but the bindings can be persuaded to return data as Python lists, if desired. +Under Python3, string values are returned as bytes objects unless a character +encoding is specified which is used to convert to (Unicode) strings. See the +character_encoding member. + Full documentation for the Python bindings to the GetData library is contained within the pygetdata module itself. To read this documentation, execute diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/m4/python.m4 new/getdata-0.9.4/m4/python.m4 --- old/getdata-0.9.3/m4/python.m4 2016-06-30 01:36:00.000000000 +0200 +++ new/getdata-0.9.4/m4/python.m4 2016-09-02 03:59:25.000000000 +0200 @@ -21,7 +21,7 @@ dnl GD_LOG_SHELL(STUFF) dnl --------------------------------------------------------------- dnl Run STUFF as a shell command and log it -AC_DEFUN([AM_LOG_SHELL], +AC_DEFUN([GD_LOG_SHELL], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ac_status=$? @@ -31,9 +31,12 @@ dnl GD_PYTHON_CONFIGVAR(VAR, KEY) dnl --------------------------------------------------------------- dnl Store the value of config_var KEY in VAR +dnl +dnl the superfluous exec call here is to work around a bug in +dnl bash-4.1's parser. (See change 1.hh in bash-4.2-alpha) AC_DEFUN([GD_PYTHON_CONFIGVAR], [ - $1=$(${PYTHON} - <<EOF 2>/dev/null + $1=$(exec ${PYTHON} - <<EOF 2>/dev/null try: import sysconfig except ImportError: @@ -52,7 +55,7 @@ dnl otherwise set it to "no" AC_DEFUN([GD_PYTHON3], [ -AS_IF(AM_LOG_SHELL( +AS_IF(GD_LOG_SHELL( [$1 -c 'import sys; sys.exit(int(sys.version@<:@:1@:>@) - 3)'] ), [have_python3=yes],[have_python3=no]) ]) @@ -194,20 +197,41 @@ AC_SUBST([PYTHON_PLATFORM]) dnl calculate the extension module directory +dnl +dnl Debian's version of distutils is too clever. Its install paths change +dnl based on the prefix you provide. We pass the current best-guess for +dnl ${exec_prefix} as a result. This may lead to incorrect behaviour at +dnl make install time, if the user changes PREFIX then, but this should do +dnl the right thing in the common case, where prefix doesn't change after +dnl configure-time. +dnl +dnl See the comment under GD_PYTHON_CONFIGVAR for the reason for the +dnl exec call here AC_MSG_CHECKING([Python extension module directory]) if test "x${local_python_modpath}" = "x"; then - pythondir=$(${PYTHON} - <<EOF 2>/dev/null + +dnl Calculate current exec_prefix + pyexec_prefix=$exec_prefix + test "x$pyexec_prefix" = xNONE && pyexec_prefix=$prefix + test "x$pyexec_prefix" = xNONE && pyexec_prefix=$ac_default_prefix + + prefixed_pythondir=$(exec ${PYTHON} - <<EOF 2>/dev/null import sys if sys.version[[:1]] == '3': import sysconfig - print (sysconfig.get_path('platlib', vars={'platbase': '\${exec_prefix}'})) + print (sysconfig.get_path('platlib', vars={'platbase': "${pyexec_prefix}"})) else: from distutils import sysconfig - print (sysconfig.get_python_lib(1,0,prefix='\${exec_prefix}')) + print (sysconfig.get_python_lib(1,0,prefix="${pyexec_prefix}")) EOF ) - if test "x${pythondir}" = "xNone" -o "x${pythondir}" = "x"; then + if test "x${prefixed_pythondir}" = "xNone" -o "x${prefixed_pythondir}" = "x"; + then pythondir='\${exec_prefix}/lib/python${PYTHON_LDVERSION}/site-packages' + else + esc_pyexec_prefix=$(echo ${pyexec_prefix} | ${SED} -e 's/\//\\\//g') + pythondir=$(echo ${prefixed_pythondir} | \ + ${SED} -e "s/^${esc_pyexec_prefix}/\${exec_prefix}/") fi else pythondir=$local_python_modpath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/m4/version.m4 new/getdata-0.9.4/m4/version.m4 --- old/getdata-0.9.3/m4/version.m4 2016-07-20 23:03:59.000000000 +0200 +++ new/getdata-0.9.4/m4/version.m4 2016-09-08 01:23:27.000000000 +0200 @@ -20,7 +20,7 @@ m4_define(getdata_major, 0) m4_define(getdata_minor, 9) -m4_define(getdata_revision, 3) +m4_define(getdata_revision, 4) m4_define(getdata_extra, []) m4_define(getdata_pkg_extra,[]) m4_define(getdata_version, @@ -31,7 +31,7 @@ dnl libgetdata current interface version m4_define(getdata_iface_version, 7) dnl libgetdata current interface implementation revision -m4_define(getdata_impl_revision, 3) +m4_define(getdata_impl_revision, 4) dnl libgetdata interface age (current interface - oldest supported interface) m4_define(getdata_iface_age, 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/src/flac.c new/getdata-0.9.4/src/flac.c --- old/getdata-0.9.3/src/flac.c 2016-03-05 05:32:05.000000000 +0100 +++ new/getdata-0.9.4/src/flac.c 2016-09-02 01:33:23.000000000 +0200 @@ -106,7 +106,7 @@ ptr = (int16_t*)gdfl->data; /* Copy and dechannelise the decoded data to our local buffer */ - if (gdfl->bps == 1) + if (gdfl->bps == 8) for (u = 0; u < frame->header.blocksize; ++u) /* there's only one channel in this case */ gdfl->data[u] = (int8_t)buffer[0][u]; @@ -267,8 +267,10 @@ if (ns > gdfl->dlen - gdfl->pos) ns = gdfl->dlen - gdfl->pos; - memcpy(output, gdfl->data + gdfl->pos, ns * GD_SIZE(data_type)); - gdfl->pos += ns; + if (ns > 0) { + memcpy(output, gdfl->data + gdfl->pos, ns * GD_SIZE(data_type)); + gdfl->pos += ns; + } dreturn("%" PRIuSIZE, ns); return ns; @@ -278,15 +280,17 @@ gd_type_t data_type, size_t nmemb) { struct gd_flacdata *gdfl = (struct gd_flacdata *)file->edata; - void *output = data; - size_t ns = nmemb; + char *output = data; + size_t s, ns = nmemb; dtrace("%p, %p, 0x%X, %" PRIuSIZE, file, data, data_type, nmemb); for (;;) { /* copy the currently loaded frame to the output */ - ns -= _GD_FlacOutput(gdfl, data_type, output, ns); - if (ns == 0) + s = _GD_FlacOutput(gdfl, data_type, output, ns); + output += s * GD_SIZE(data_type); + + if ((ns -= s) == 0) break; /* Decode one frame */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/Makefile.am new/getdata-0.9.4/test/Makefile.am --- old/getdata-0.9.3/test/Makefile.am 2016-06-28 03:22:30.000000000 +0200 +++ new/getdata-0.9.4/test/Makefile.am 2016-09-02 01:46:32.000000000 +0200 @@ -166,9 +166,9 @@ FILE_TESTS=file file_code file_type FLAC_TESTS=flac_add flac_get_big flac_get_far flac_get_get flac_get_get2 \ - flac_get_little flac_nframes flac_put_big flac_put_complex128 \ - flac_put_float64 flac_put_int32 flac_put_little flac_seek \ - flac_seek_far flac_sync + flac_get_int8 flac_get_int64 flac_get_little flac_get_long \ + flac_nframes flac_put_big flac_put_complex128 flac_put_float64 \ + flac_put_int32 flac_put_little flac_seek flac_seek_far flac_sync FLIST_TESTS=flist flist0 flist2 flist_hidden flist_invalid flist_meta \ flist_meta2 flist_meta_hidden flist_meta_invalid flist_type \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/Makefile.in new/getdata-0.9.4/test/Makefile.in --- old/getdata-0.9.3/test/Makefile.in 2016-07-20 23:25:05.000000000 +0200 +++ new/getdata-0.9.4/test/Makefile.in 2016-09-08 01:23:42.000000000 +0200 @@ -343,11 +343,13 @@ am__EXEEXT_20 = file$(EXEEXT) file_code$(EXEEXT) file_type$(EXEEXT) am__EXEEXT_21 = flac_add$(EXEEXT) flac_get_big$(EXEEXT) \ flac_get_far$(EXEEXT) flac_get_get$(EXEEXT) \ - flac_get_get2$(EXEEXT) flac_get_little$(EXEEXT) \ - flac_nframes$(EXEEXT) flac_put_big$(EXEEXT) \ - flac_put_complex128$(EXEEXT) flac_put_float64$(EXEEXT) \ - flac_put_int32$(EXEEXT) flac_put_little$(EXEEXT) \ - flac_seek$(EXEEXT) flac_seek_far$(EXEEXT) flac_sync$(EXEEXT) + flac_get_get2$(EXEEXT) flac_get_int8$(EXEEXT) \ + flac_get_int64$(EXEEXT) flac_get_little$(EXEEXT) \ + flac_get_long$(EXEEXT) flac_nframes$(EXEEXT) \ + flac_put_big$(EXEEXT) flac_put_complex128$(EXEEXT) \ + flac_put_float64$(EXEEXT) flac_put_int32$(EXEEXT) \ + flac_put_little$(EXEEXT) flac_seek$(EXEEXT) \ + flac_seek_far$(EXEEXT) flac_sync$(EXEEXT) am__EXEEXT_22 = flist$(EXEEXT) flist0$(EXEEXT) flist2$(EXEEXT) \ flist_hidden$(EXEEXT) flist_invalid$(EXEEXT) \ flist_meta$(EXEEXT) flist_meta2$(EXEEXT) \ @@ -2402,10 +2404,22 @@ flac_get_get2_OBJECTS = flac_get_get2.$(OBJEXT) flac_get_get2_LDADD = $(LDADD) flac_get_get2_DEPENDENCIES = ../src/libgetdata.la +flac_get_int64_SOURCES = flac_get_int64.c +flac_get_int64_OBJECTS = flac_get_int64.$(OBJEXT) +flac_get_int64_LDADD = $(LDADD) +flac_get_int64_DEPENDENCIES = ../src/libgetdata.la +flac_get_int8_SOURCES = flac_get_int8.c +flac_get_int8_OBJECTS = flac_get_int8.$(OBJEXT) +flac_get_int8_LDADD = $(LDADD) +flac_get_int8_DEPENDENCIES = ../src/libgetdata.la flac_get_little_SOURCES = flac_get_little.c flac_get_little_OBJECTS = flac_get_little.$(OBJEXT) flac_get_little_LDADD = $(LDADD) flac_get_little_DEPENDENCIES = ../src/libgetdata.la +flac_get_long_SOURCES = flac_get_long.c +flac_get_long_OBJECTS = flac_get_long.$(OBJEXT) +flac_get_long_LDADD = $(LDADD) +flac_get_long_DEPENDENCIES = ../src/libgetdata.la flac_nframes_SOURCES = flac_nframes.c flac_nframes_OBJECTS = flac_nframes.$(OBJEXT) flac_nframes_LDADD = $(LDADD) @@ -5735,7 +5749,8 @@ error_error.c error_num.c error_short.c error_verbose.c \ error_verbose_prefix.c file.c file_code.c file_type.c \ flac_add.c flac_get_big.c flac_get_far.c flac_get_get.c \ - flac_get_get2.c flac_get_little.c flac_nframes.c \ + flac_get_get2.c flac_get_int64.c flac_get_int8.c \ + flac_get_little.c flac_get_long.c flac_nframes.c \ flac_put_big.c flac_put_complex128.c flac_put_float64.c \ flac_put_int32.c flac_put_little.c flac_seek.c flac_seek_far.c \ flac_sync.c flist.c flist0.c flist2.c flist_hidden.c \ @@ -6114,7 +6129,8 @@ error_error.c error_num.c error_short.c error_verbose.c \ error_verbose_prefix.c file.c file_code.c file_type.c \ flac_add.c flac_get_big.c flac_get_far.c flac_get_get.c \ - flac_get_get2.c flac_get_little.c flac_nframes.c \ + flac_get_get2.c flac_get_int64.c flac_get_int8.c \ + flac_get_little.c flac_get_long.c flac_nframes.c \ flac_put_big.c flac_put_complex128.c flac_put_float64.c \ flac_put_int32.c flac_put_little.c flac_seek.c flac_seek_far.c \ flac_sync.c flist.c flist0.c flist2.c flist_hidden.c \ @@ -6783,9 +6799,9 @@ FILE_TESTS = file file_code file_type FLAC_TESTS = flac_add flac_get_big flac_get_far flac_get_get flac_get_get2 \ - flac_get_little flac_nframes flac_put_big flac_put_complex128 \ - flac_put_float64 flac_put_int32 flac_put_little flac_seek \ - flac_seek_far flac_sync + flac_get_int8 flac_get_int64 flac_get_little flac_get_long \ + flac_nframes flac_put_big flac_put_complex128 flac_put_float64 \ + flac_put_int32 flac_put_little flac_seek flac_seek_far flac_sync FLIST_TESTS = flist flist0 flist2 flist_hidden flist_invalid flist_meta \ flist_meta2 flist_meta_hidden flist_meta_invalid flist_type \ @@ -8687,10 +8703,22 @@ @rm -f flac_get_get2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(flac_get_get2_OBJECTS) $(flac_get_get2_LDADD) $(LIBS) +flac_get_int64$(EXEEXT): $(flac_get_int64_OBJECTS) $(flac_get_int64_DEPENDENCIES) $(EXTRA_flac_get_int64_DEPENDENCIES) + @rm -f flac_get_int64$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(flac_get_int64_OBJECTS) $(flac_get_int64_LDADD) $(LIBS) + +flac_get_int8$(EXEEXT): $(flac_get_int8_OBJECTS) $(flac_get_int8_DEPENDENCIES) $(EXTRA_flac_get_int8_DEPENDENCIES) + @rm -f flac_get_int8$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(flac_get_int8_OBJECTS) $(flac_get_int8_LDADD) $(LIBS) + flac_get_little$(EXEEXT): $(flac_get_little_OBJECTS) $(flac_get_little_DEPENDENCIES) $(EXTRA_flac_get_little_DEPENDENCIES) @rm -f flac_get_little$(EXEEXT) $(AM_V_CCLD)$(LINK) $(flac_get_little_OBJECTS) $(flac_get_little_LDADD) $(LIBS) +flac_get_long$(EXEEXT): $(flac_get_long_OBJECTS) $(flac_get_long_DEPENDENCIES) $(EXTRA_flac_get_long_DEPENDENCIES) + @rm -f flac_get_long$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(flac_get_long_OBJECTS) $(flac_get_long_LDADD) $(LIBS) + flac_nframes$(EXEEXT): $(flac_nframes_OBJECTS) $(flac_nframes_DEPENDENCIES) $(EXTRA_flac_nframes_DEPENDENCIES) @rm -f flac_nframes$(EXEEXT) $(AM_V_CCLD)$(LINK) $(flac_nframes_OBJECTS) $(flac_nframes_LDADD) $(LIBS) @@ -12241,7 +12269,10 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_get_far.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_get_get.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_get_get2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_get_int64.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_get_int8.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_get_little.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_get_long.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_nframes.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_put_big.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flac_put_complex128.Po@am__quote@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_get_big.c new/getdata-0.9.4/test/flac_get_big.c --- old/getdata-0.9.3/test/flac_get_big.c 2015-09-28 07:25:16.000000000 +0200 +++ new/getdata-0.9.4/test/flac_get_big.c 2016-09-08 01:27:38.000000000 +0200 @@ -57,7 +57,8 @@ /* encode */ snprintf(command, 4096, "%s --endian=big --silent --sample-rate=1 --channels=1 --bps=16 " - "--sign=signed --delete-input-file %s > /dev/null", FLAC, data); + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); if (gd_system(command)) return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_get_far.c new/getdata-0.9.4/test/flac_get_far.c --- old/getdata-0.9.3/test/flac_get_far.c 2015-09-25 05:27:05.000000000 +0200 +++ new/getdata-0.9.4/test/flac_get_far.c 2016-09-08 01:27:51.000000000 +0200 @@ -53,7 +53,8 @@ snprintf(command, 4096, "%s --endian=little --silent --sample-rate=1 --channels=1 --bps=16 " - "--sign=signed --delete-input-file %s > /dev/null", FLAC, data); + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); if (gd_system(command)) return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_get_get.c new/getdata-0.9.4/test/flac_get_get.c --- old/getdata-0.9.3/test/flac_get_get.c 2015-09-25 07:46:16.000000000 +0200 +++ new/getdata-0.9.4/test/flac_get_get.c 2016-09-08 01:28:15.000000000 +0200 @@ -54,7 +54,8 @@ snprintf(command, 4096, "%s --endian=little --silent --sample-rate=1 --channels=1 --bps=16 " - "--sign=signed --delete-input-file %s > /dev/null", FLAC, data); + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); if (gd_system(command)) return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_get_get2.c new/getdata-0.9.4/test/flac_get_get2.c --- old/getdata-0.9.3/test/flac_get_get2.c 2015-09-24 04:36:08.000000000 +0200 +++ new/getdata-0.9.4/test/flac_get_get2.c 2016-09-08 01:28:26.000000000 +0200 @@ -55,7 +55,8 @@ /* compress */ snprintf(command, 4096, "%s --endian=little --silent --sample-rate=1 --channels=1 --bps=16 " - "--sign=signed --delete-input-file %s > /dev/null", FLAC, data); + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); if (gd_system(command)) return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_get_int64.c new/getdata-0.9.4/test/flac_get_int64.c --- old/getdata-0.9.3/test/flac_get_int64.c 1970-01-01 01:00:00.000000000 +0100 +++ new/getdata-0.9.4/test/flac_get_int64.c 2016-09-08 01:28:40.000000000 +0200 @@ -0,0 +1,92 @@ +/* Copyright (C) 2016 D. V. Wiebe + * + *************************************************************************** + * + * This file is part of the GetData project. + * + * GetData is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * GetData is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with GetData; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "test.h" + +int main(void) +{ +#ifndef TEST_FLAC + return 77; +#else + const char *filedir = "dirfile"; + const char *format = "dirfile/format"; + const char *data = "dirfile/data"; + const char *flacdata = "dirfile/data.flac"; + const char *format_data = "data RAW UINT64 8\n"; + int64_t c[8]; + char command[4096]; + int64_t data_data[256]; + int fd, n, error, r = 0; +#ifdef USE_FLAC + int i; +#endif + DIRFILE *D; + + memset(c, 0, 8); + rmdirfile(); + mkdir(filedir, 0777); + + for (fd = 0; fd < 256; ++fd) + data_data[fd] = (unsigned char)fd; + + fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666); + write(fd, format_data, strlen(format_data)); + close(fd); + + fd = open(data, O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0666); + write(fd, data_data, 256 * sizeof(uint64_t)); + close(fd); + + /* encode */ + snprintf(command, 4096, + "%s --endian=little --silent --sample-rate=1 --channels=4 --bps=16 " + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); + if (gd_system(command)) + return 1; + +#ifdef USE_FLAC + D = gd_open(filedir, GD_RDONLY | GD_VERBOSE | GD_LITTLE_ENDIAN); +#else + D = gd_open(filedir, GD_RDONLY | GD_LITTLE_ENDIAN); +#endif + n = gd_getdata(D, "data", 5, 0, 1, 0, GD_UINT64, c); + error = gd_error(D); + +#ifdef USE_FLAC + CHECKI(error, 0); + CHECKI(n, 8); + + for (i = 0; i < 8; ++i) + CHECKXi(i,c[i],40+i); +#else + CHECKI(error, GD_E_UNSUPPORTED); + CHECKI(n, 0); +#endif + + gd_discard(D); + + unlink(flacdata); + unlink(format); + rmdir(filedir); + + return r; +#endif +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_get_int8.c new/getdata-0.9.4/test/flac_get_int8.c --- old/getdata-0.9.3/test/flac_get_int8.c 1970-01-01 01:00:00.000000000 +0100 +++ new/getdata-0.9.4/test/flac_get_int8.c 2016-09-08 01:28:48.000000000 +0200 @@ -0,0 +1,92 @@ +/* Copyright (C) 2016 D. V. Wiebe + * + *************************************************************************** + * + * This file is part of the GetData project. + * + * GetData is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * GetData is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with GetData; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "test.h" + +int main(void) +{ +#ifndef TEST_FLAC + return 77; +#else + const char *filedir = "dirfile"; + const char *format = "dirfile/format"; + const char *data = "dirfile/data"; + const char *flacdata = "dirfile/data.flac"; + const char *format_data = "data RAW UINT8 8\n"; + int8_t c[8]; + char command[4096]; + int8_t data_data[256]; + int fd, n, error, r = 0; +#ifdef USE_FLAC + int i; +#endif + DIRFILE *D; + + memset(c, 0, 8); + rmdirfile(); + mkdir(filedir, 0777); + + for (fd = 0; fd < 256; ++fd) + data_data[fd] = (unsigned char)fd; + + fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666); + write(fd, format_data, strlen(format_data)); + close(fd); + + fd = open(data, O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0666); + write(fd, data_data, 256 * sizeof(uint8_t)); + close(fd); + + /* encode */ + snprintf(command, 4096, + "%s --endian=little --silent --sample-rate=1 --channels=1 --bps=8 " + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); + if (gd_system(command)) + return 1; + +#ifdef USE_FLAC + D = gd_open(filedir, GD_RDONLY | GD_VERBOSE | GD_LITTLE_ENDIAN); +#else + D = gd_open(filedir, GD_RDONLY | GD_LITTLE_ENDIAN); +#endif + n = gd_getdata(D, "data", 5, 0, 1, 0, GD_UINT8, c); + error = gd_error(D); + +#ifdef USE_FLAC + CHECKI(error, 0); + CHECKI(n, 8); + + for (i = 0; i < 8; ++i) + CHECKXi(i,c[i],40+i); +#else + CHECKI(error, GD_E_UNSUPPORTED); + CHECKI(n, 0); +#endif + + gd_discard(D); + + unlink(flacdata); + unlink(format); + rmdir(filedir); + + return r; +#endif +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_get_little.c new/getdata-0.9.4/test/flac_get_little.c --- old/getdata-0.9.3/test/flac_get_little.c 2015-09-28 07:14:32.000000000 +0200 +++ new/getdata-0.9.4/test/flac_get_little.c 2016-09-08 01:28:57.000000000 +0200 @@ -57,7 +57,8 @@ /* encode */ snprintf(command, 4096, "%s --endian=little --silent --sample-rate=1 --channels=1 --bps=16 " - "--sign=signed --delete-input-file %s > /dev/null", FLAC, data); + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); if (gd_system(command)) return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_get_long.c new/getdata-0.9.4/test/flac_get_long.c --- old/getdata-0.9.3/test/flac_get_long.c 1970-01-01 01:00:00.000000000 +0100 +++ new/getdata-0.9.4/test/flac_get_long.c 2016-09-08 01:29:09.000000000 +0200 @@ -0,0 +1,83 @@ +/* Copyright (C) 2016 D. V. Wiebe + * + *************************************************************************** + * + * This file is part of the GetData project. + * + * GetData is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * GetData is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with GetData; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "test.h" + +#define N 65536 +int main(void) +{ +#if ! (defined TEST_FLAC && defined USE_FLAC) + return 77; +#else + const char *filedir = "dirfile"; + const char *format = "dirfile/format"; + const char *data = "dirfile/data"; + const char *flacdata = "dirfile/data.flac"; + const char *format_data = "data RAW UINT16 8\n"; + char command[4096]; + uint16_t *dataw, *datar; + int i, fd, n, error, r = 0; + DIRFILE *D; + + rmdirfile(); + mkdir(filedir, 0777); + + dataw = malloc(N * sizeof(*dataw)); + datar = malloc(N * sizeof(*datar)); + + for (i = 0; i < N; ++i) + dataw[i] = i; + + fd = open(format, O_CREAT | O_EXCL | O_WRONLY, 0666); + write(fd, format_data, strlen(format_data)); + close(fd); + + fd = open(data, O_CREAT | O_EXCL | O_WRONLY | O_BINARY, 0666); + write(fd, dataw, N * sizeof(*dataw)); + close(fd); + + snprintf(command, 4096, + "%s --endian=little --silent --sample-rate=1 --channels=1 --bps=16 " + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); + if (gd_system(command)) + return 1; + + D = gd_open(filedir, GD_RDONLY); + n = gd_getdata(D, "data", 0, 0, 0, N, GD_UINT16, datar); + CHECKI(n, N); + + error = gd_error(D); + CHECKI(error, 0); + + gd_discard(D); + + for (i = 0; i < N; ++i) + CHECKIi(i, datar[i], dataw[i]); + + unlink(flacdata); + unlink(format); + rmdir(filedir); + free(dataw); + free(datar); + + return r; +#endif +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_nframes.c new/getdata-0.9.4/test/flac_nframes.c --- old/getdata-0.9.3/test/flac_nframes.c 2015-09-23 22:39:07.000000000 +0200 +++ new/getdata-0.9.4/test/flac_nframes.c 2016-09-08 01:29:18.000000000 +0200 @@ -60,7 +60,8 @@ /* compress */ snprintf(command, 4096, "%s --endian=little --silent --sample-rate=1 --channels=1 --bps=16 " - "--sign=signed --delete-input-file %s > /dev/null", FLAC, data); + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); if (gd_system(command)) return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_seek.c new/getdata-0.9.4/test/flac_seek.c --- old/getdata-0.9.3/test/flac_seek.c 2015-09-28 07:14:32.000000000 +0200 +++ new/getdata-0.9.4/test/flac_seek.c 2016-09-08 01:29:32.000000000 +0200 @@ -53,7 +53,8 @@ /* encode */ snprintf(command, 4096, "%s --endian=little --silent --sample-rate=1 --channels=1 --bps=16 " - "--sign=signed --delete-input-file %s > /dev/null", FLAC, data); + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); if (gd_system(command)) return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_seek_far.c new/getdata-0.9.4/test/flac_seek_far.c --- old/getdata-0.9.3/test/flac_seek_far.c 2015-09-25 02:52:39.000000000 +0200 +++ new/getdata-0.9.4/test/flac_seek_far.c 2016-09-08 01:29:42.000000000 +0200 @@ -53,7 +53,8 @@ /* encode */ snprintf(command, 4096, "%s --endian=little --silent --sample-rate=1 --channels=1 --bps=16 " - "--sign=signed --delete-input-file %s > /dev/null", FLAC, data); + "--sign=signed --delete-input-file %s >/dev/null 2>/dev/null", FLAC, + data); if (gd_system(command)) return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/getdata-0.9.3/test/flac_sync.c new/getdata-0.9.4/test/flac_sync.c --- old/getdata-0.9.3/test/flac_sync.c 2015-09-25 07:46:35.000000000 +0200 +++ new/getdata-0.9.4/test/flac_sync.c 2016-09-08 01:30:06.000000000 +0200 @@ -66,8 +66,8 @@ /* uncompress */ snprintf(command, 4096, "%s --silent --decode --delete-input-file " - "--force-raw-format --sign=signed --endian=little %s --output-name=%s", - FLAC, data_flac, data); + "--force-raw-format --sign=signed --endian=little %s --output-name=%s " + ">/dev/null 2>/dev/null", FLAC, data_flac, data); if (gd_system(command)) { r = 1; } else {
