[SCM] bs1770gain/master: Update packaging to version 0.4.2.
pere at users.alioth.debian.org
pere at users.alioth.debian.org
Wed Jun 10 07:51:02 UTC 2015
The following commit has been merged in the master branch:
commit dc121ae56a085a71c990f882158a298a4ebb79c1
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Wed Jun 10 07:50:32 2015 +0000
Update packaging to version 0.4.2.
diff --git a/debian/changelog b/debian/changelog
index 5809b29..ef73666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-bs1770gain (0.4.1-1) UNRELEASED; urgency=medium
+bs1770gain (0.4.2-1) UNRELEASED; urgency=medium
* Initial release (Closes: #781026).
diff --git a/debian/patches/01-libpbutil.diff b/debian/patches/01-libpbutil.diff
deleted file mode 100644
index d025b32..0000000
--- a/debian/patches/01-libpbutil.diff
+++ /dev/null
@@ -1,1803 +0,0 @@
-Description: Add source missing from upstream tarball.
- Using bs1770gain-0.4.1-src-libpbutil.tar.gz from
- http://sourceforge.net/projects/bs1770gain/files/bs1770gain/0.4.1/ .
-Forwarded: not-needed
-Origin: vendor, http://sourceforge.net/projects/bs1770gain/files/bs1770gain/0.4.1/
-Author: Peter Belkner <pbelkner at snafu.de>
-
-diff --git a/libpbutil/COPYING b/libpbutil/COPYING
-new file mode 100644
-index 0000000..94a9ed0
---- /dev/null
-+++ b/libpbutil/COPYING
-@@ -0,0 +1,674 @@
-+ GNU GENERAL PUBLIC LICENSE
-+ Version 3, 29 June 2007
-+
-+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+ Preamble
-+
-+ The GNU General Public License is a free, copyleft license for
-+software and other kinds of works.
-+
-+ The licenses for most software and other practical works are designed
-+to take away your freedom to share and change the works. By contrast,
-+the GNU General Public License is intended to guarantee your freedom to
-+share and change all versions of a program--to make sure it remains free
-+software for all its users. We, the Free Software Foundation, use the
-+GNU General Public License for most of our software; it applies also to
-+any other work released this way by its authors. You can apply it to
-+your programs, too.
-+
-+ When we speak of free software, we are referring to freedom, not
-+price. Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+them if you wish), that you receive source code or can get it if you
-+want it, that you can change the software or use pieces of it in new
-+free programs, and that you know you can do these things.
-+
-+ To protect your rights, we need to prevent others from denying you
-+these rights or asking you to surrender the rights. Therefore, you have
-+certain responsibilities if you distribute copies of the software, or if
-+you modify it: responsibilities to respect the freedom of others.
-+
-+ For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must pass on to the recipients the same
-+freedoms that you received. You must make sure that they, too, receive
-+or can get the source code. And you must show them these terms so they
-+know their rights.
-+
-+ Developers that use the GNU GPL protect your rights with two steps:
-+(1) assert copyright on the software, and (2) offer you this License
-+giving you legal permission to copy, distribute and/or modify it.
-+
-+ For the developers' and authors' protection, the GPL clearly explains
-+that there is no warranty for this free software. For both users' and
-+authors' sake, the GPL requires that modified versions be marked as
-+changed, so that their problems will not be attributed erroneously to
-+authors of previous versions.
-+
-+ Some devices are designed to deny users access to install or run
-+modified versions of the software inside them, although the manufacturer
-+can do so. This is fundamentally incompatible with the aim of
-+protecting users' freedom to change the software. The systematic
-+pattern of such abuse occurs in the area of products for individuals to
-+use, which is precisely where it is most unacceptable. Therefore, we
-+have designed this version of the GPL to prohibit the practice for those
-+products. If such problems arise substantially in other domains, we
-+stand ready to extend this provision to those domains in future versions
-+of the GPL, as needed to protect the freedom of users.
-+
-+ Finally, every program is threatened constantly by software patents.
-+States should not allow patents to restrict development and use of
-+software on general-purpose computers, but in those that do, we wish to
-+avoid the special danger that patents applied to a free program could
-+make it effectively proprietary. To prevent this, the GPL assures that
-+patents cannot be used to render the program non-free.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+ TERMS AND CONDITIONS
-+
-+ 0. Definitions.
-+
-+ "This License" refers to version 3 of the GNU General Public License.
-+
-+ "Copyright" also means copyright-like laws that apply to other kinds of
-+works, such as semiconductor masks.
-+
-+ "The Program" refers to any copyrightable work licensed under this
-+License. Each licensee is addressed as "you". "Licensees" and
-+"recipients" may be individuals or organizations.
-+
-+ To "modify" a work means to copy from or adapt all or part of the work
-+in a fashion requiring copyright permission, other than the making of an
-+exact copy. The resulting work is called a "modified version" of the
-+earlier work or a work "based on" the earlier work.
-+
-+ A "covered work" means either the unmodified Program or a work based
-+on the Program.
-+
-+ To "propagate" a work means to do anything with it that, without
-+permission, would make you directly or secondarily liable for
-+infringement under applicable copyright law, except executing it on a
-+computer or modifying a private copy. Propagation includes copying,
-+distribution (with or without modification), making available to the
-+public, and in some countries other activities as well.
-+
-+ To "convey" a work means any kind of propagation that enables other
-+parties to make or receive copies. Mere interaction with a user through
-+a computer network, with no transfer of a copy, is not conveying.
-+
-+ An interactive user interface displays "Appropriate Legal Notices"
-+to the extent that it includes a convenient and prominently visible
-+feature that (1) displays an appropriate copyright notice, and (2)
-+tells the user that there is no warranty for the work (except to the
-+extent that warranties are provided), that licensees may convey the
-+work under this License, and how to view a copy of this License. If
-+the interface presents a list of user commands or options, such as a
-+menu, a prominent item in the list meets this criterion.
-+
-+ 1. Source Code.
-+
-+ The "source code" for a work means the preferred form of the work
-+for making modifications to it. "Object code" means any non-source
-+form of a work.
-+
-+ A "Standard Interface" means an interface that either is an official
-+standard defined by a recognized standards body, or, in the case of
-+interfaces specified for a particular programming language, one that
-+is widely used among developers working in that language.
-+
-+ The "System Libraries" of an executable work include anything, other
-+than the work as a whole, that (a) is included in the normal form of
-+packaging a Major Component, but which is not part of that Major
-+Component, and (b) serves only to enable use of the work with that
-+Major Component, or to implement a Standard Interface for which an
-+implementation is available to the public in source code form. A
-+"Major Component", in this context, means a major essential component
-+(kernel, window system, and so on) of the specific operating system
-+(if any) on which the executable work runs, or a compiler used to
-+produce the work, or an object code interpreter used to run it.
-+
-+ The "Corresponding Source" for a work in object code form means all
-+the source code needed to generate, install, and (for an executable
-+work) run the object code and to modify the work, including scripts to
-+control those activities. However, it does not include the work's
-+System Libraries, or general-purpose tools or generally available free
-+programs which are used unmodified in performing those activities but
-+which are not part of the work. For example, Corresponding Source
-+includes interface definition files associated with source files for
-+the work, and the source code for shared libraries and dynamically
-+linked subprograms that the work is specifically designed to require,
-+such as by intimate data communication or control flow between those
-+subprograms and other parts of the work.
-+
-+ The Corresponding Source need not include anything that users
-+can regenerate automatically from other parts of the Corresponding
-+Source.
-+
-+ The Corresponding Source for a work in source code form is that
-+same work.
-+
-+ 2. Basic Permissions.
-+
-+ All rights granted under this License are granted for the term of
-+copyright on the Program, and are irrevocable provided the stated
-+conditions are met. This License explicitly affirms your unlimited
-+permission to run the unmodified Program. The output from running a
-+covered work is covered by this License only if the output, given its
-+content, constitutes a covered work. This License acknowledges your
-+rights of fair use or other equivalent, as provided by copyright law.
-+
-+ You may make, run and propagate covered works that you do not
-+convey, without conditions so long as your license otherwise remains
-+in force. You may convey covered works to others for the sole purpose
-+of having them make modifications exclusively for you, or provide you
-+with facilities for running those works, provided that you comply with
-+the terms of this License in conveying all material for which you do
-+not control copyright. Those thus making or running the covered works
-+for you must do so exclusively on your behalf, under your direction
-+and control, on terms that prohibit them from making any copies of
-+your copyrighted material outside their relationship with you.
-+
-+ Conveying under any other circumstances is permitted solely under
-+the conditions stated below. Sublicensing is not allowed; section 10
-+makes it unnecessary.
-+
-+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-+
-+ No covered work shall be deemed part of an effective technological
-+measure under any applicable law fulfilling obligations under article
-+11 of the WIPO copyright treaty adopted on 20 December 1996, or
-+similar laws prohibiting or restricting circumvention of such
-+measures.
-+
-+ When you convey a covered work, you waive any legal power to forbid
-+circumvention of technological measures to the extent such circumvention
-+is effected by exercising rights under this License with respect to
-+the covered work, and you disclaim any intention to limit operation or
-+modification of the work as a means of enforcing, against the work's
-+users, your or third parties' legal rights to forbid circumvention of
-+technological measures.
-+
-+ 4. Conveying Verbatim Copies.
-+
-+ You may convey verbatim copies of the Program's source code as you
-+receive it, in any medium, provided that you conspicuously and
-+appropriately publish on each copy an appropriate copyright notice;
-+keep intact all notices stating that this License and any
-+non-permissive terms added in accord with section 7 apply to the code;
-+keep intact all notices of the absence of any warranty; and give all
-+recipients a copy of this License along with the Program.
-+
-+ You may charge any price or no price for each copy that you convey,
-+and you may offer support or warranty protection for a fee.
-+
-+ 5. Conveying Modified Source Versions.
-+
-+ You may convey a work based on the Program, or the modifications to
-+produce it from the Program, in the form of source code under the
-+terms of section 4, provided that you also meet all of these conditions:
-+
-+ a) The work must carry prominent notices stating that you modified
-+ it, and giving a relevant date.
-+
-+ b) The work must carry prominent notices stating that it is
-+ released under this License and any conditions added under section
-+ 7. This requirement modifies the requirement in section 4 to
-+ "keep intact all notices".
-+
-+ c) You must license the entire work, as a whole, under this
-+ License to anyone who comes into possession of a copy. This
-+ License will therefore apply, along with any applicable section 7
-+ additional terms, to the whole of the work, and all its parts,
-+ regardless of how they are packaged. This License gives no
-+ permission to license the work in any other way, but it does not
-+ invalidate such permission if you have separately received it.
-+
-+ d) If the work has interactive user interfaces, each must display
-+ Appropriate Legal Notices; however, if the Program has interactive
-+ interfaces that do not display Appropriate Legal Notices, your
-+ work need not make them do so.
-+
-+ A compilation of a covered work with other separate and independent
-+works, which are not by their nature extensions of the covered work,
-+and which are not combined with it such as to form a larger program,
-+in or on a volume of a storage or distribution medium, is called an
-+"aggregate" if the compilation and its resulting copyright are not
-+used to limit the access or legal rights of the compilation's users
-+beyond what the individual works permit. Inclusion of a covered work
-+in an aggregate does not cause this License to apply to the other
-+parts of the aggregate.
-+
-+ 6. Conveying Non-Source Forms.
-+
-+ You may convey a covered work in object code form under the terms
-+of sections 4 and 5, provided that you also convey the
-+machine-readable Corresponding Source under the terms of this License,
-+in one of these ways:
-+
-+ a) Convey the object code in, or embodied in, a physical product
-+ (including a physical distribution medium), accompanied by the
-+ Corresponding Source fixed on a durable physical medium
-+ customarily used for software interchange.
-+
-+ b) Convey the object code in, or embodied in, a physical product
-+ (including a physical distribution medium), accompanied by a
-+ written offer, valid for at least three years and valid for as
-+ long as you offer spare parts or customer support for that product
-+ model, to give anyone who possesses the object code either (1) a
-+ copy of the Corresponding Source for all the software in the
-+ product that is covered by this License, on a durable physical
-+ medium customarily used for software interchange, for a price no
-+ more than your reasonable cost of physically performing this
-+ conveying of source, or (2) access to copy the
-+ Corresponding Source from a network server at no charge.
-+
-+ c) Convey individual copies of the object code with a copy of the
-+ written offer to provide the Corresponding Source. This
-+ alternative is allowed only occasionally and noncommercially, and
-+ only if you received the object code with such an offer, in accord
-+ with subsection 6b.
-+
-+ d) Convey the object code by offering access from a designated
-+ place (gratis or for a charge), and offer equivalent access to the
-+ Corresponding Source in the same way through the same place at no
-+ further charge. You need not require recipients to copy the
-+ Corresponding Source along with the object code. If the place to
-+ copy the object code is a network server, the Corresponding Source
-+ may be on a different server (operated by you or a third party)
-+ that supports equivalent copying facilities, provided you maintain
-+ clear directions next to the object code saying where to find the
-+ Corresponding Source. Regardless of what server hosts the
-+ Corresponding Source, you remain obligated to ensure that it is
-+ available for as long as needed to satisfy these requirements.
-+
-+ e) Convey the object code using peer-to-peer transmission, provided
-+ you inform other peers where the object code and Corresponding
-+ Source of the work are being offered to the general public at no
-+ charge under subsection 6d.
-+
-+ A separable portion of the object code, whose source code is excluded
-+from the Corresponding Source as a System Library, need not be
-+included in conveying the object code work.
-+
-+ A "User Product" is either (1) a "consumer product", which means any
-+tangible personal property which is normally used for personal, family,
-+or household purposes, or (2) anything designed or sold for incorporation
-+into a dwelling. In determining whether a product is a consumer product,
-+doubtful cases shall be resolved in favor of coverage. For a particular
-+product received by a particular user, "normally used" refers to a
-+typical or common use of that class of product, regardless of the status
-+of the particular user or of the way in which the particular user
-+actually uses, or expects or is expected to use, the product. A product
-+is a consumer product regardless of whether the product has substantial
-+commercial, industrial or non-consumer uses, unless such uses represent
-+the only significant mode of use of the product.
-+
-+ "Installation Information" for a User Product means any methods,
-+procedures, authorization keys, or other information required to install
-+and execute modified versions of a covered work in that User Product from
-+a modified version of its Corresponding Source. The information must
-+suffice to ensure that the continued functioning of the modified object
-+code is in no case prevented or interfered with solely because
-+modification has been made.
-+
-+ If you convey an object code work under this section in, or with, or
-+specifically for use in, a User Product, and the conveying occurs as
-+part of a transaction in which the right of possession and use of the
-+User Product is transferred to the recipient in perpetuity or for a
-+fixed term (regardless of how the transaction is characterized), the
-+Corresponding Source conveyed under this section must be accompanied
-+by the Installation Information. But this requirement does not apply
-+if neither you nor any third party retains the ability to install
-+modified object code on the User Product (for example, the work has
-+been installed in ROM).
-+
-+ The requirement to provide Installation Information does not include a
-+requirement to continue to provide support service, warranty, or updates
-+for a work that has been modified or installed by the recipient, or for
-+the User Product in which it has been modified or installed. Access to a
-+network may be denied when the modification itself materially and
-+adversely affects the operation of the network or violates the rules and
-+protocols for communication across the network.
-+
-+ Corresponding Source conveyed, and Installation Information provided,
-+in accord with this section must be in a format that is publicly
-+documented (and with an implementation available to the public in
-+source code form), and must require no special password or key for
-+unpacking, reading or copying.
-+
-+ 7. Additional Terms.
-+
-+ "Additional permissions" are terms that supplement the terms of this
-+License by making exceptions from one or more of its conditions.
-+Additional permissions that are applicable to the entire Program shall
-+be treated as though they were included in this License, to the extent
-+that they are valid under applicable law. If additional permissions
-+apply only to part of the Program, that part may be used separately
-+under those permissions, but the entire Program remains governed by
-+this License without regard to the additional permissions.
-+
-+ When you convey a copy of a covered work, you may at your option
-+remove any additional permissions from that copy, or from any part of
-+it. (Additional permissions may be written to require their own
-+removal in certain cases when you modify the work.) You may place
-+additional permissions on material, added by you to a covered work,
-+for which you have or can give appropriate copyright permission.
-+
-+ Notwithstanding any other provision of this License, for material you
-+add to a covered work, you may (if authorized by the copyright holders of
-+that material) supplement the terms of this License with terms:
-+
-+ a) Disclaiming warranty or limiting liability differently from the
-+ terms of sections 15 and 16 of this License; or
-+
-+ b) Requiring preservation of specified reasonable legal notices or
-+ author attributions in that material or in the Appropriate Legal
-+ Notices displayed by works containing it; or
-+
-+ c) Prohibiting misrepresentation of the origin of that material, or
-+ requiring that modified versions of such material be marked in
-+ reasonable ways as different from the original version; or
-+
-+ d) Limiting the use for publicity purposes of names of licensors or
-+ authors of the material; or
-+
-+ e) Declining to grant rights under trademark law for use of some
-+ trade names, trademarks, or service marks; or
-+
-+ f) Requiring indemnification of licensors and authors of that
-+ material by anyone who conveys the material (or modified versions of
-+ it) with contractual assumptions of liability to the recipient, for
-+ any liability that these contractual assumptions directly impose on
-+ those licensors and authors.
-+
-+ All other non-permissive additional terms are considered "further
-+restrictions" within the meaning of section 10. If the Program as you
-+received it, or any part of it, contains a notice stating that it is
-+governed by this License along with a term that is a further
-+restriction, you may remove that term. If a license document contains
-+a further restriction but permits relicensing or conveying under this
-+License, you may add to a covered work material governed by the terms
-+of that license document, provided that the further restriction does
-+not survive such relicensing or conveying.
-+
-+ If you add terms to a covered work in accord with this section, you
-+must place, in the relevant source files, a statement of the
-+additional terms that apply to those files, or a notice indicating
-+where to find the applicable terms.
-+
-+ Additional terms, permissive or non-permissive, may be stated in the
-+form of a separately written license, or stated as exceptions;
-+the above requirements apply either way.
-+
-+ 8. Termination.
-+
-+ You may not propagate or modify a covered work except as expressly
-+provided under this License. Any attempt otherwise to propagate or
-+modify it is void, and will automatically terminate your rights under
-+this License (including any patent licenses granted under the third
-+paragraph of section 11).
-+
-+ However, if you cease all violation of this License, then your
-+license from a particular copyright holder is reinstated (a)
-+provisionally, unless and until the copyright holder explicitly and
-+finally terminates your license, and (b) permanently, if the copyright
-+holder fails to notify you of the violation by some reasonable means
-+prior to 60 days after the cessation.
-+
-+ Moreover, your license from a particular copyright holder is
-+reinstated permanently if the copyright holder notifies you of the
-+violation by some reasonable means, this is the first time you have
-+received notice of violation of this License (for any work) from that
-+copyright holder, and you cure the violation prior to 30 days after
-+your receipt of the notice.
-+
-+ Termination of your rights under this section does not terminate the
-+licenses of parties who have received copies or rights from you under
-+this License. If your rights have been terminated and not permanently
-+reinstated, you do not qualify to receive new licenses for the same
-+material under section 10.
-+
-+ 9. Acceptance Not Required for Having Copies.
-+
-+ You are not required to accept this License in order to receive or
-+run a copy of the Program. Ancillary propagation of a covered work
-+occurring solely as a consequence of using peer-to-peer transmission
-+to receive a copy likewise does not require acceptance. However,
-+nothing other than this License grants you permission to propagate or
-+modify any covered work. These actions infringe copyright if you do
-+not accept this License. Therefore, by modifying or propagating a
-+covered work, you indicate your acceptance of this License to do so.
-+
-+ 10. Automatic Licensing of Downstream Recipients.
-+
-+ Each time you convey a covered work, the recipient automatically
-+receives a license from the original licensors, to run, modify and
-+propagate that work, subject to this License. You are not responsible
-+for enforcing compliance by third parties with this License.
-+
-+ An "entity transaction" is a transaction transferring control of an
-+organization, or substantially all assets of one, or subdividing an
-+organization, or merging organizations. If propagation of a covered
-+work results from an entity transaction, each party to that
-+transaction who receives a copy of the work also receives whatever
-+licenses to the work the party's predecessor in interest had or could
-+give under the previous paragraph, plus a right to possession of the
-+Corresponding Source of the work from the predecessor in interest, if
-+the predecessor has it or can get it with reasonable efforts.
-+
-+ You may not impose any further restrictions on the exercise of the
-+rights granted or affirmed under this License. For example, you may
-+not impose a license fee, royalty, or other charge for exercise of
-+rights granted under this License, and you may not initiate litigation
-+(including a cross-claim or counterclaim in a lawsuit) alleging that
-+any patent claim is infringed by making, using, selling, offering for
-+sale, or importing the Program or any portion of it.
-+
-+ 11. Patents.
-+
-+ A "contributor" is a copyright holder who authorizes use under this
-+License of the Program or a work on which the Program is based. The
-+work thus licensed is called the contributor's "contributor version".
-+
-+ A contributor's "essential patent claims" are all patent claims
-+owned or controlled by the contributor, whether already acquired or
-+hereafter acquired, that would be infringed by some manner, permitted
-+by this License, of making, using, or selling its contributor version,
-+but do not include claims that would be infringed only as a
-+consequence of further modification of the contributor version. For
-+purposes of this definition, "control" includes the right to grant
-+patent sublicenses in a manner consistent with the requirements of
-+this License.
-+
-+ Each contributor grants you a non-exclusive, worldwide, royalty-free
-+patent license under the contributor's essential patent claims, to
-+make, use, sell, offer for sale, import and otherwise run, modify and
-+propagate the contents of its contributor version.
-+
-+ In the following three paragraphs, a "patent license" is any express
-+agreement or commitment, however denominated, not to enforce a patent
-+(such as an express permission to practice a patent or covenant not to
-+sue for patent infringement). To "grant" such a patent license to a
-+party means to make such an agreement or commitment not to enforce a
-+patent against the party.
-+
-+ If you convey a covered work, knowingly relying on a patent license,
-+and the Corresponding Source of the work is not available for anyone
-+to copy, free of charge and under the terms of this License, through a
-+publicly available network server or other readily accessible means,
-+then you must either (1) cause the Corresponding Source to be so
-+available, or (2) arrange to deprive yourself of the benefit of the
-+patent license for this particular work, or (3) arrange, in a manner
-+consistent with the requirements of this License, to extend the patent
-+license to downstream recipients. "Knowingly relying" means you have
-+actual knowledge that, but for the patent license, your conveying the
-+covered work in a country, or your recipient's use of the covered work
-+in a country, would infringe one or more identifiable patents in that
-+country that you have reason to believe are valid.
-+
-+ If, pursuant to or in connection with a single transaction or
-+arrangement, you convey, or propagate by procuring conveyance of, a
-+covered work, and grant a patent license to some of the parties
-+receiving the covered work authorizing them to use, propagate, modify
-+or convey a specific copy of the covered work, then the patent license
-+you grant is automatically extended to all recipients of the covered
-+work and works based on it.
-+
-+ A patent license is "discriminatory" if it does not include within
-+the scope of its coverage, prohibits the exercise of, or is
-+conditioned on the non-exercise of one or more of the rights that are
-+specifically granted under this License. You may not convey a covered
-+work if you are a party to an arrangement with a third party that is
-+in the business of distributing software, under which you make payment
-+to the third party based on the extent of your activity of conveying
-+the work, and under which the third party grants, to any of the
-+parties who would receive the covered work from you, a discriminatory
-+patent license (a) in connection with copies of the covered work
-+conveyed by you (or copies made from those copies), or (b) primarily
-+for and in connection with specific products or compilations that
-+contain the covered work, unless you entered into that arrangement,
-+or that patent license was granted, prior to 28 March 2007.
-+
-+ Nothing in this License shall be construed as excluding or limiting
-+any implied license or other defenses to infringement that may
-+otherwise be available to you under applicable patent law.
-+
-+ 12. No Surrender of Others' Freedom.
-+
-+ If conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot convey a
-+covered work so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you may
-+not convey it at all. For example, if you agree to terms that obligate you
-+to collect a royalty for further conveying from those to whom you convey
-+the Program, the only way you could satisfy both those terms and this
-+License would be to refrain entirely from conveying the Program.
-+
-+ 13. Use with the GNU Affero General Public License.
-+
-+ Notwithstanding any other provision of this License, you have
-+permission to link or combine any covered work with a work licensed
-+under version 3 of the GNU Affero General Public License into a single
-+combined work, and to convey the resulting work. The terms of this
-+License will continue to apply to the part which is the covered work,
-+but the special requirements of the GNU Affero General Public License,
-+section 13, concerning interaction through a network will apply to the
-+combination as such.
-+
-+ 14. Revised Versions of this License.
-+
-+ The Free Software Foundation may publish revised and/or new versions of
-+the GNU General Public License from time to time. Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+ Each version is given a distinguishing version number. If the
-+Program specifies that a certain numbered version of the GNU General
-+Public License "or any later version" applies to it, you have the
-+option of following the terms and conditions either of that numbered
-+version or of any later version published by the Free Software
-+Foundation. If the Program does not specify a version number of the
-+GNU General Public License, you may choose any version ever published
-+by the Free Software Foundation.
-+
-+ If the Program specifies that a proxy can decide which future
-+versions of the GNU General Public License can be used, that proxy's
-+public statement of acceptance of a version permanently authorizes you
-+to choose that version for the Program.
-+
-+ Later license versions may give you additional or different
-+permissions. However, no additional obligations are imposed on any
-+author or copyright holder as a result of your choosing to follow a
-+later version.
-+
-+ 15. Disclaimer of Warranty.
-+
-+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-+
-+ 16. Limitation of Liability.
-+
-+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-+SUCH DAMAGES.
-+
-+ 17. Interpretation of Sections 15 and 16.
-+
-+ If the disclaimer of warranty and limitation of liability provided
-+above cannot be given local legal effect according to their terms,
-+reviewing courts shall apply local law that most closely approximates
-+an absolute waiver of all civil liability in connection with the
-+Program, unless a warranty or assumption of liability accompanies a
-+copy of the Program in return for a fee.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Programs
-+
-+ If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+ To do so, attach the following notices to the program. It is safest
-+to attach them to the start of each source file to most effectively
-+state the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the program's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This program is free software: you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation, either version 3 of the License, or
-+ (at your option) any later version.
-+
-+ This program 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 General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program. If not, see <http://www.gnu.org/licenses/>.
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+ If the program does terminal interaction, make it output a short
-+notice like this when it starts in an interactive mode:
-+
-+ <program> Copyright (C) <year> <name of author>
-+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+ This is free software, and you are welcome to redistribute it
-+ under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License. Of course, your program's commands
-+might be different; for a GUI interface, you would use an "about box".
-+
-+ You should also get your employer (if you work as a programmer) or school,
-+if any, to sign a "copyright disclaimer" for the program, if necessary.
-+For more information on this, and how to apply and follow the GNU GPL, see
-+<http://www.gnu.org/licenses/>.
-+
-+ The GNU General Public License does not permit incorporating your program
-+into proprietary programs. If your program is a subroutine library, you
-+may consider it more useful to permit linking proprietary applications with
-+the library. If this is what you want to do, use the GNU Lesser General
-+Public License instead of this License. But first, please read
-+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-diff --git a/libpbutil/Makefile b/libpbutil/Makefile
-new file mode 100644
-index 0000000..5b63028
---- /dev/null
-+++ b/libpbutil/Makefile
-@@ -0,0 +1,42 @@
-+include config.mak
-+include $(SRCDIR)/version.mak
-+vpath % $(SRCDIR)
-+.PHONY: all install clean
-+
-+CC=gcc
-+CPPFLAGS+=-I$(SRCDIR)
-+CPPFLAGS+=-I$(INCLUDEDIR)
-+CFLAGS+=-O2
-+CFLAGS+=-Wall
-+CFLAGS+=-Werror
-+
-+LIBPBUTIL_H+=pbutil.h
-+LIBPBUTIL_H+=pbutil_priv.h
-+
-+LIBPBUTIL_A=libpbutil.a
-+
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_list.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_extend_path.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_mkdir.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_s2w.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_copy_file.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_same_file.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_ext.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_basename.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_wcstok.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_strtok.o)
-+LIBPBUTIL_O+=$(LIBPBUTIL_A)(pbu_msvcrt.o)
-+$(LIBPBUTIL_O): $(LIBPBUTIL_H)
-+$(LIBPBUTIL_A): $(LIBPBUTIL_O)
-+all: $(LIBPBUTIL_A)
-+install: $(patsubst %.h,$(INCLUDEDIR)/%.h,$(LIBPBUTIL_H))
-+install: $(LIBDIR)/libpbutil.a
-+$(INCLUDEDIR)/%: %
-+ mkdir -p $(@D)
-+ cp $< $(@D)
-+$(LIBDIR)/%: %
-+ mkdir -p $(@D)
-+ cp $< $(@D)
-+
-+clean:
-+ rm -f *.a *.o
-diff --git a/libpbutil/configure b/libpbutil/configure
-new file mode 100755
-index 0000000..a2f252e
---- /dev/null
-+++ b/libpbutil/configure
-@@ -0,0 +1,142 @@
-+#!/bin/sh
-+##
-+ # configure
-+ # Copyright (C) 2015 Peter Belkner <pbelkner at snafu.de>
-+ #
-+ # This program is free software: you can redistribute it and/or modify
-+ # it under the terms of the GNU General Public License as published by
-+ # the Free Software Foundation, either version 3 of the License, or
-+ # (at your option) any later version.
-+ #
-+ # This program 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 General Public License for more details.
-+ #
-+ # You should have received a copy of the GNU General Public License
-+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ #
-+srcdir=`dirname "$0"|sed -e 's,/$,,g'`
-+pfx=/usr/local
-+tooldir='$(PWD)'
-+reldir='release'
-+enable_static='yes'
-+enable_shared='yes'
-+
-+###############################################################################
-+oss="linux mingw"
-+
-+for i in $oss; do
-+ if test 1 -eq `uname|grep -i $i|wc -l`; then os=$i; fi
-+done
-+
-+if [ 'x' = "x${os}" ]; then "Error: OS not supported."; exit 1; fi
-+
-+###############################################################################
-+help() {
-+ echo "Usage: $0 [OPTION]... [VAR=VALUE]..."
-+ exit $1
-+}
-+
-+extract() {
-+ echo "$1"|sed -e "s/$2=//g"
-+}
-+
-+extract_enable() {
-+ case `echo "$1"|sed -e "s/--enable-$2//g"` in
-+ '') echo "yes" ;;
-+ =yes) echo "yes" ;;
-+ =no) echo "no" ;;
-+ *) help 1 ;;
-+ esac
-+}
-+
-+extract_disable() {
-+ case `echo "$1"|sed -e "s/--disable-$2//g"` in
-+ '') echo "no" ;;
-+ =yes) echo "no" ;;
-+ =no) echo "yes" ;;
-+ *) help 1 ;;
-+ esac
-+}
-+
-+while test "$1" != ''; do
-+ case $1 in
-+ --help) help 0 ;;
-+ --os=*) os=`extract "$1" '--os'` ;;
-+ --bits=*) bits=`extract "$1" '--bits'` ;;
-+ --msvs=*) msvs=`extract "$1" '--msvs'` ;;
-+ --mssdk=*) mssdk=`extract "$1" '--mssdk'` ;;
-+ --prefix=*) pfx=`extract "$1" '--prefix'` ;;
-+ --bindir=*) bindir=`extract "$1" '--bindir'` ;;
-+ --libdir=*) libdir=`extract "$1" '--libdir'` ;;
-+ --includedir=*) includedir=`extract "$1" '--includedir'` ;;
-+ --reldir=*) reldir=`extract "$1" '--reldir'` ;;
-+ --host=*) host=`extract "$1" '--host'` ;;
-+ --tooldir=*) tooldir=`extract "$1" '--tooldir'` ;;
-+ --enable-static*) enable_static=`extract_enable "$1" 'static'` ;;
-+ --disable-static*) enable_static=`extract_disable "$1" 'static'` ;;
-+ --enable-shared*) enable_shared=`extract_enable "$1" 'shared'` ;;
-+ --disable-shared*) enable_shared=`extract_disable "$1" 'shared'` ;;
-+ CFLAGS=*) cflags=`extract "$1" 'CFLAGS'` ;;
-+ CPPFLAGS=*) cppflags=`extract "$1" 'CPPFLAGS'` ;;
-+ LDFLAGS=*) ldflags=`extract "$1" 'LDFLAGS'` ;;
-+ LIBS=*) libs=`extract "$1" 'LIBS'` ;;
-+ *) echo "Error: Unknow option: $1."; help 1 ;;
-+ esac
-+ shift
-+done
-+
-+###############################################################################
-+normpath() {
-+ if test 'x' = "x$1" -o "." = "$1"; then
-+ echo "$PWD"
-+ else
-+ echo "$1"|sed -e "s,^\([^/]\),$PWD/\1,g"
-+ fi
-+}
-+
-+pfx=`normpath "$pfx"`
-+srcdir=`normpath "$srcdir"`
-+reldir=`normpath "$reldir"`
-+#if [ 'x' = "x${bits}" ]; then bits=`"$srcdir"/bits`; fi
-+
-+###############################################################################
-+pfxpath() {
-+ if test 'x' = "x$1" -o "." = "$1"; then
-+ echo "$pfx/$2"
-+ else
-+ normpath "$1"
-+ fi
-+}
-+
-+bindir=`pfxpath "$bindir" bin`
-+libdir=`pfxpath "$libdir" lib`
-+includedir=`pfxpath "$includedir" include`
-+
-+###############################################################################
-+rm -f config.mak
-+touch config.mak
-+
-+echo "OS=$os" >> config.mak
-+echo "PREFIX=$pfx" >> config.mak
-+echo "SRCDIR=$srcdir" >> config.mak
-+echo "BINDIR=$bindir" >> config.mak
-+echo "LIBDIR=$libdir" >> config.mak
-+echo "INCLUDEDIR=$includedir" >> config.mak
-+echo "TOOLDIR=$tooldir" >> config.mak
-+echo "RELDIR=$reldir" >> config.mak
-+echo "HOST=$host" >> config.mak
-+echo "ENABLE_STATIC=$enable_static" >> config.mak
-+echo "ENABLE_SHARED=$enable_shared" >> config.mak
-+if [ 'x' != "x$bits" ]; then echo "BITS=$bits" >> config.mak; fi
-+if [ 'x' != "x$mssdk" ]; then echo "MSSDK=$mssdk" >> config.mak; fi
-+if [ 'x' != "x$msvs" ]; then echo "MSVS=$msvs" >> config.mak; fi
-+if [ 'x' != "x$cflags" ]; then echo "CFLAGS+=$cflags" >> config.mak; fi
-+if [ 'x' != "x$cppflags" ]; then echo "CPPFLAGS+=$cppflags" >> config.mak; fi
-+if [ 'x' != "x$ldflags" ]; then echo "LDFLAGS+=$ldflags" >> config.mak; fi
-+if [ 'x' != "x$libs" ]; then echo "LIBS+=$libs" >> config.mak; fi
-+
-+if test ! . -ef $srcdir; then
-+ cp $srcdir/Makefile .
-+fi
-diff --git a/libpbutil/pbu_basename.c b/libpbutil/pbu_basename.c
-new file mode 100644
-index 0000000..1cad424
---- /dev/null
-+++ b/libpbutil/pbu_basename.c
-@@ -0,0 +1,40 @@
-+/*
-+ * pbu_basename.c
-+ * Copyright (C) 2014 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#include <pbutil.h>
-+
-+const char *pbu_basename(const char *path)
-+{
-+ const char *p;
-+
-+ if (NULL==path)
-+ return NULL;
-+
-+ p=path+strlen(path);
-+
-+ // TODO: unicode.
-+ while (path<p&&('/'==p[-1]||'\\'==p[-1]))
-+ --p;
-+
-+ // TODO: unicode.
-+ while (path<p&&('/'!=p[-1]&&'\\'!=p[-1]))
-+ --p;
-+
-+ return p;
-+}
-diff --git a/libpbutil/pbu_copy_file.c b/libpbutil/pbu_copy_file.c
-new file mode 100644
-index 0000000..101a29c
---- /dev/null
-+++ b/libpbutil/pbu_copy_file.c
-@@ -0,0 +1,83 @@
-+/*
-+ * pbu_copy_file.c
-+ * Copyright (C) 2014 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#include <pbutil.h>
-+
-+#if defined (WIN32) // {
-+int pbu_copy_file(const wchar_t *src, const wchar_t *dst)
-+{
-+ BOOL b;
-+
-+#if 1 // {
-+ b=CopyFileW(
-+ src, // _In_ LPCTSTR lpExistingFileName,
-+ dst, // _In_ LPCTSTR lpNewFileName,
-+ 1 // _In_ BOOL bFailIfExists
-+ );
-+#else // } {
-+ b=CopyFileExW(
-+ src, // _In_ LPCTSTR lpExistingFileName,
-+ dst, // _In_ LPCTSTR lpNewFileName,
-+ NULL, // _In_opt_ LPPROGRESS_ROUTINE lpProgressRoutine,
-+ NULL, // _In_opt_ LPVOID lpData,
-+ FALSE, // _In_opt_ LPBOOL pbCancel,
-+ 0 // _In_ DWORD dwCopyFlags
-+);
-+#endif // }
-+
-+ return b?0:-1;
-+}
-+#else // } {
-+int pbu_copy_file(const char *src, const char *dst)
-+{
-+ enum { SIZE=4096 };
-+ int code=-1;
-+ FILE *f1,*f2;
-+ void *buf;
-+ size_t size;
-+
-+ if (NULL==(f1=fopen(src,"rb")))
-+ goto f1;
-+
-+ if (NULL==(f2=fopen(src,"wb")))
-+ goto f2;
-+
-+ if (NULL==(buf=malloc(SIZE)))
-+ goto buf;
-+
-+ for (;;) {
-+ if ((size=fread(buf,SIZE,1,f1))<SIZE) {
-+ if (feof(f1))
-+ break;
-+ else
-+ goto read;
-+ }
-+ }
-+
-+ code=0;
-+read:
-+ free(buf);
-+buf:
-+ fclose(f2);
-+f2:
-+ fclose(f1);
-+f1:
-+ return code;
-+}
-+#endif // }
-diff --git a/libpbutil/pbu_ext.c b/libpbutil/pbu_ext.c
-new file mode 100644
-index 0000000..715fa29
---- /dev/null
-+++ b/libpbutil/pbu_ext.c
-@@ -0,0 +1,31 @@
-+/*
-+ * pbu_ext.c
-+ * Copyright (C) 2014 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#include <pbutil.h>
-+
-+const char *pbu_ext(const char *path)
-+{
-+ const char *p=path+strlen(path);
-+
-+ // TODO: unicode.
-+ while (path<p&&'.'!=p[-1])
-+ --p;
-+
-+ return p;
-+}
-diff --git a/libpbutil/pbu_extend_path.c b/libpbutil/pbu_extend_path.c
-new file mode 100644
-index 0000000..b0ba9aa
---- /dev/null
-+++ b/libpbutil/pbu_extend_path.c
-@@ -0,0 +1,50 @@
-+/*
-+ * pbu_extend_path.c
-+ * Copyright (C) 2014 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#include <pbutil_priv.h>
-+
-+char *pbu_extend_path(const char *dirname, const char *basename)
-+{
-+ const char *p1;
-+ char *path,*p2;
-+ int len1,len2;
-+
-+ path=NULL;
-+ p1=dirname+strlen(dirname);
-+
-+ // TODO: unicode.
-+ while (dirname<p1&&('/'==p1[-1]||'\\'==p1[-1]))
-+ --p1;
-+
-+ len1=p1-dirname;
-+ len2=strlen(basename);
-+
-+ if (NULL==(path=malloc((len1+1)+(len2+1)))) {
-+ MESSAGE("allocating path");
-+ goto path;
-+ }
-+
-+ p2=path;
-+ memcpy(p2,dirname,len1);
-+ p2+=len1;
-+ *p2++='/';
-+ strcpy(p2,basename);
-+path:
-+ return path;
-+}
-diff --git a/libpbutil/pbu_list.c b/libpbutil/pbu_list.c
-new file mode 100644
-index 0000000..bf35854
---- /dev/null
-+++ b/libpbutil/pbu_list.c
-@@ -0,0 +1,97 @@
-+/*
-+ * pbu_list.c
-+ * Copyright (C) 2014 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#include <pbutil_priv.h>
-+
-+///////////////////////////////////////////////////////////////////////////////
-+void *pbu_list_create(void *node)
-+{
-+ list_t *n=node;
-+
-+ n->prev=node;
-+ n->next=node;
-+
-+ return node;
-+}
-+
-+int pbu_list_append(void *head, void *node, size_t size)
-+{
-+ list_t **hp=head;
-+ list_t *h=*hp;
-+ list_t *n;
-+
-+ if (NULL==(n=malloc(size)))
-+ goto malloc;
-+
-+ memcpy(n,node,size);
-+
-+ if (NULL==h) {
-+ n->prev=n;
-+ n->next=n;
-+ h=n;
-+ }
-+ else {
-+ n->next=h;
-+ n->prev=h->prev;
-+ h->prev->next=n;
-+ h->prev=n;
-+ }
-+
-+ *hp=h;
-+
-+ return 0;
-+malloc:
-+ return -1;
-+}
-+
-+void *pbu_list_remove_link(void *head, void *node)
-+{
-+ list_t *h=head;
-+ list_t *n=node;
-+
-+ if (n!=h)
-+ ;
-+ else if (n->next!=h)
-+ h=n->next;
-+ else
-+ h=NULL;
-+
-+ n->prev->next=n->next;
-+ n->next->prev=n->prev;
-+ n->prev=NULL;
-+ n->next=NULL;
-+
-+ return h;
-+}
-+
-+void pbu_list_free_full(void *head, void *free_func)
-+{
-+ list_t *h=head;
-+ list_t *n;
-+
-+ while (NULL!=(n=h)) {
-+ h=pbu_list_remove_link(n,n);
-+ ((void (*)(list_t *))free_func)(n);
-+ }
-+}
-+
-+void pbu_list_free(void *head)
-+{
-+ pbu_list_free_full(head,free);
-+}
-diff --git a/libpbutil/pbu_mkdir.c b/libpbutil/pbu_mkdir.c
-new file mode 100644
-index 0000000..ae8c238
---- /dev/null
-+++ b/libpbutil/pbu_mkdir.c
-@@ -0,0 +1,99 @@
-+/*
-+ * pbu_mkdir.c
-+ * Copyright (C) 2015 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#include <pbutil_priv.h>
-+#if defined (WIN32) // {
-+#include <direct.h>
-+#else // } {
-+#include <sys/stat.h>
-+#endif // }
-+
-+void pbu_mkdir(char *path)
-+{
-+#if defined (WIN32) // {
-+ size_t size;
-+ wchar_t *wpath,*p1,*p2;
-+#else // } {
-+ char *p1,*p2;
-+#endif // }
-+ int ch;
-+
-+#if defined (WIN32) // {
-+ size=MultiByteToWideChar(
-+ CP_UTF8, // __in UINT CodePage,
-+ 0, // __in DWORD dwFlags,
-+ path, // __in LPCSTR lpMultiByteStr,
-+ -1, // __in int cbMultiByte,
-+ NULL, // __out_opt LPWSTR lpWideCharStr,
-+ 0 // __in int cchWideChar
-+ );
-+
-+ if (NULL==(wpath=malloc(size*(sizeof *wpath)))) {
-+ MESSAGE("allocating wide path");
-+ goto wpath;
-+ }
-+
-+ size=MultiByteToWideChar(
-+ CP_UTF8, // __in UINT CodePage,
-+ 0, // __in DWORD dwFlags,
-+ path, // __in LPCSTR lpMultiByteStr,
-+ -1, // __in int cbMultiByte,
-+ wpath, // __out_opt LPWSTR lpWideCharStr,
-+ size // __in int cchWideChar
-+ );
-+
-+ p1=wpath;
-+#else // } {
-+ p1=path;
-+#endif // }
-+
-+ for (;;) {
-+ p2=p1;
-+
-+ // TODO: unicode.
-+ while (0!=*p2&&'/'!=*p2&&'\\'!=*p2)
-+ ++p2;
-+
-+ if (0==*p2) {
-+#if defined (WIN32) // {
-+ _wmkdir(wpath);
-+#else // } {
-+ mkdir(path,S_IRWXU|S_IRWXG|S_IRWXO);
-+#endif // }
-+ break;
-+ }
-+ else {
-+ ch=*p2;
-+ *p2=0;
-+#if defined (WIN32) // {
-+ _wmkdir(wpath);
-+#else // } {
-+ mkdir(path,S_IRWXU|S_IRWXG|S_IRWXO);
-+#endif // }
-+ *p2=ch;
-+ p1=p2+1;
-+ }
-+ }
-+
-+#if defined (WIN32) // {
-+ free(wpath);
-+wpath:
-+ return;
-+#endif // }
-+}
-diff --git a/libpbutil/pbu_msvcrt.c b/libpbutil/pbu_msvcrt.c
-new file mode 100644
-index 0000000..a164d8d
---- /dev/null
-+++ b/libpbutil/pbu_msvcrt.c
-@@ -0,0 +1,32 @@
-+/*
-+ * pbu_strtok.c
-+ * Copyright (C) 2014 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#if defined (WIN32) // {
-+#include <pbutil.h>
-+
-+HANDLE pbu_msvcrt(void)
-+{
-+ static HANDLE hLib=NULL;
-+
-+ if (NULL==hLib)
-+ hLib=LoadLibraryA("msvcrt.dll");
-+
-+ return hLib;
-+}
-+#endif // }
-diff --git a/libpbutil/pbu_s2w.c b/libpbutil/pbu_s2w.c
-new file mode 100644
-index 0000000..ffe082d
---- /dev/null
-+++ b/libpbutil/pbu_s2w.c
-@@ -0,0 +1,56 @@
-+/*
-+ * pbu_s2w.c
-+ * Copyright (C) 2014 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#if defined (WIN32) // {
-+#include <pbutil.h>
-+
-+wchar_t *pbu_s2w(const char *s)
-+{
-+ size_t size;
-+ wchar_t *w;
-+
-+ w=NULL;
-+
-+ if (NULL==s)
-+ goto w;
-+
-+ size=MultiByteToWideChar(
-+ CP_UTF8, // __in UINT CodePage,
-+ 0, // __in DWORD dwFlags,
-+ s, // __in LPCSTR lpMultiByteStr,
-+ -1, // __in int cbMultiByte,
-+ NULL, // __out_opt LPWSTR lpWideCharStr,
-+ 0 // __in int cchWideChar
-+ );
-+
-+ if (NULL==(w=malloc(size*(sizeof *w))))
-+ goto w;
-+
-+ size=MultiByteToWideChar(
-+ CP_UTF8, // __in UINT CodePage,
-+ 0, // __in DWORD dwFlags,
-+ s, // __in LPCSTR lpMultiByteStr,
-+ -1, // __in int cbMultiByte,
-+ w, // __out_opt LPWSTR lpWideCharStr,
-+ size // __in int cchWideChar
-+ );
-+w:
-+ return w;
-+}
-+#endif // }
-diff --git a/libpbutil/pbu_same_file.c b/libpbutil/pbu_same_file.c
-new file mode 100644
-index 0000000..76a43f0
---- /dev/null
-+++ b/libpbutil/pbu_same_file.c
-@@ -0,0 +1,99 @@
-+/*
-+ * pbu_same_file.c
-+ * Copyright (C) 2015 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#include <pbutil.h>
-+#if defined (WIN32) // {
-+#include <windows.h>
-+typedef BY_HANDLE_FILE_INFORMATION info_t;
-+
-+static int b21770gain_get_file_info(const char *path, info_t *info)
-+{
-+ int code=-1;
-+ HANDLE hFile;
-+ BOOL b;
-+
-+ memset(info,0,sizeof *info);
-+
-+ hFile=CreateFileA(
-+ path, // __in LPCTSTR lpFileName,
-+ GENERIC_READ, // __in DWORD dwDesiredAccess,
-+ FILE_SHARE_READ|FILE_SHARE_WRITE,
-+ // __in DWORD dwShareMode,
-+ NULL, // __in_opt LPSECURITY_ATTRIBUTES lpSecurityAttributes,
-+ OPEN_EXISTING, // __in DWORD dwCreationDisposition,
-+ 0, // __in DWORD dwFlagsAndAttributes,
-+ NULL // __in_opt HANDLE hTemplateFile
-+ );
-+
-+ if (NULL==hFile)
-+ goto file;
-+
-+ b=GetFileInformationByHandle(
-+ hFile, // _In_ HANDLE hFile,
-+ info // _Out_ LPBY_HANDLE_FILE_INFORMATION lpFileInformation
-+ );
-+
-+ if (0==b)
-+ goto info;
-+
-+ code=0;
-+info:
-+ CloseHandle(hFile);
-+file:
-+ return code;
-+}
-+
-+int pbu_same_file(const char *path1, const char *path2)
-+{
-+ int code=-1;
-+ info_t info1,info2;
-+
-+ if (b21770gain_get_file_info(path1,&info1)<0)
-+ goto info1;
-+
-+ if (b21770gain_get_file_info(path2,&info2)<0)
-+ goto info2;
-+
-+ code=info1.nFileIndexHigh!=info2.nFileIndexHigh
-+ ||info1.nFileIndexLow!=info2.nFileIndexLow;
-+info2:
-+info1:
-+ return code;
-+}
-+#else // } {
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
-+int pbu_same_file(const char *path1, const char *path2)
-+{
-+ int code=-1;
-+ struct stat buf1,buf2;
-+
-+ if (stat(path1,&buf1)<0)
-+ goto buf1;
-+
-+ if (stat(path2,&buf2)<0)
-+ goto buf2;
-+
-+ code=buf1.st_ino!=buf2.st_ino||buf1.st_dev!=buf2.st_dev;
-+buf2:
-+buf1:
-+ return code;
-+}
-+#endif // }
-diff --git a/libpbutil/pbu_strtok.c b/libpbutil/pbu_strtok.c
-new file mode 100644
-index 0000000..8247013
---- /dev/null
-+++ b/libpbutil/pbu_strtok.c
-@@ -0,0 +1,49 @@
-+/*
-+ * pbu_strtok.c
-+ * Copyright (C) 2014 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#if defined (WIN32) // {
-+#include <pbutil.h>
-+
-+static char *pbu_strtok(char *str, const char *delim, char **saveptr)
-+{
-+ return strtok(str,delim);
-+}
-+
-+char *pbu_strtok_r(char *str, const char *delim, char **saveptr)
-+{
-+ typedef typeof (strtok_s) *strtok_s_t;
-+ static strtok_s_t strtok_s=NULL;
-+ HANDLE hLib;
-+
-+ if (NULL==strtok_s) {
-+ if (NULL==(hLib=pbu_msvcrt()))
-+ goto strtok;
-+
-+ if (NULL==(strtok_s=(strtok_s_t)GetProcAddress(hLib,"strtok_s")))
-+ goto strtok;
-+
-+ goto strtok_s;
-+ strtok:
-+ strtok_s=pbu_strtok;
-+ goto strtok_s;
-+ }
-+strtok_s:
-+ return strtok_s(str,delim,saveptr);
-+}
-+#endif // }
-diff --git a/libpbutil/pbu_wcstok.c b/libpbutil/pbu_wcstok.c
-new file mode 100644
-index 0000000..8eae354
---- /dev/null
-+++ b/libpbutil/pbu_wcstok.c
-@@ -0,0 +1,50 @@
-+/*
-+ * pbu_wstrtok.c
-+ * Copyright (C) 2014 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#if defined (WIN32) // {
-+#include <pbutil.h>
-+
-+static wchar_t *pbu_wcstok(wchar_t *str, const wchar_t *delim,
-+ wchar_t **saveptr)
-+{
-+ return wcstok(str,delim);
-+}
-+
-+wchar_t *pbu_wcstok_r(wchar_t *str, const wchar_t *delim, wchar_t **saveptr)
-+{
-+ typedef typeof (wcstok_s) *wcstok_s_t;
-+ static wcstok_s_t wcstok_s=NULL;
-+ HANDLE hLib;
-+
-+ if (NULL==wcstok_s) {
-+ if (NULL==(hLib=pbu_msvcrt()))
-+ goto wcstok;
-+
-+ if (NULL==(wcstok_s=(wcstok_s_t)GetProcAddress(hLib,"wcstok_s")))
-+ goto wcstok;
-+
-+ goto wcstok_s;
-+ wcstok:
-+ wcstok_s=pbu_wcstok;
-+ goto wcstok_s;
-+ }
-+wcstok_s:
-+ return wcstok_s(str,delim,saveptr);
-+}
-+#endif // }
-diff --git a/libpbutil/pbutil.h b/libpbutil/pbutil.h
-new file mode 100644
-index 0000000..b6795a0
---- /dev/null
-+++ b/libpbutil/pbutil.h
-@@ -0,0 +1,87 @@
-+/*
-+ * pbu.h
-+ * Copyright (C) 2015 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#ifndef __PBUTIL_H__
-+#define __PBUTIL_H__ // {
-+#if defined (WIN32) // {
-+#include <windows.h>
-+#endif // }
-+#include <stdlib.h>
-+#include <string.h>
-+#include <stdio.h>
-+#ifdef __cpluplus
-+extern "C" {
-+#endif
-+
-+///////////////////////////////////////////////////////////////////////////////
-+#define PBU_MESSAGE(m) fprintf(stderr,"Error " m ": \"%s\" (%d).\n", \
-+ pbu_basename(__FILE__),__LINE__)
-+#define PBU_MIN(x,y) ((x)<(y)?(x):(y))
-+
-+#define PBU_MAXOF(T) \
-+ (~(~0ll<<(((sizeof (T))<<3)-1)))
-+
-+#if defined (WIN32) // {
-+#define wcstok_r(str,delim,saveptr) pbu_wcstok_r(str,delim,saveptr)
-+#define strtok_r(str,delim,saveptr) pbu_strtok_r(str,delim,saveptr)
-+#endif // }
-+
-+///////////////////////////////////////////////////////////////////////////////
-+typedef struct pbu_list pbu_list_t;
-+
-+///////////////////////////////////////////////////////////////////////////////
-+#if defined (WIN32) // {
-+HANDLE pbu_msvcrt(void);
-+wchar_t *pbu_wcstok_r(wchar_t *str, const wchar_t *delim, wchar_t **saveptr);
-+char *pbu_strtok_r(char *str, const char *delim, char **saveptr);
-+int pbu_copy_file(const wchar_t *src, const wchar_t *dst);
-+wchar_t *pbu_s2w(const char *s);
-+#else // } {
-+int pbu_copy_file(const char *src, const char *dst);
-+#endif // }
-+int pbu_same_file(const char *path1, const char *path2);
-+char *pbu_extend_path(const char *dirname, const char *basename);
-+const char *pbu_ext(const char *path);
-+const char *pbu_basename(const char *path);
-+void pbu_mkdir(char *path);
-+
-+/// list //////////////////////////////////////////////////////////////////////
-+#define PBU_LIST_APPEND(l,n) \
-+ pbu_list_append(&(l),&(n),sizeof (n))
-+#define PBU_LIST_NEXT(n,l) \
-+ (*(n)=(*(n)==NULL||(l)==(*(n))->next?NULL:(*(n))->next))
-+#define PBU_LIST_FOREACH(n,l) \
-+ for (*(n)=(l);NULL!=*(n);PBU_LIST_NEXT(n,l))
-+
-+struct pbu_list {
-+#define PBU_LIST_MEM(T) \
-+ T *prev; \
-+ T *next;
-+ PBU_LIST_MEM(pbu_list_t)
-+};
-+
-+void *pbu_list_create(void *node);
-+int pbu_list_append(void *head, void *node, size_t size);
-+void *pbu_list_remove_link(void *head, void *node);
-+void pbu_list_free_full(void *head, void *free_func);
-+void pbu_list_free(void *head);
-+#ifdef __cpluplus
-+}
-+#endif
-+#endif // }
-diff --git a/libpbutil/pbutil_priv.h b/libpbutil/pbutil_priv.h
-new file mode 100644
-index 0000000..8c064bb
---- /dev/null
-+++ b/libpbutil/pbutil_priv.h
-@@ -0,0 +1,44 @@
-+/*
-+ * pbutil_priv.h
-+ * Copyright (C) 2015 Peter Belkner <pbelkner at snafu.de>
-+ *
-+ * This library 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.
-+ *
-+ * This library 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 this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA 02110-1301 USA
-+ */
-+#ifndef __PBUTIL_PRIV_H__
-+#define __PBUTIL_PRIV_H__ // {
-+#include <pbutil.h>
-+#ifdef __cpluplus
-+extern "C" {
-+#endif
-+
-+///////////////////////////////////////////////////////////////////////////////
-+#define MESSAGE(m) PBU_MESSAGE(m)
-+
-+///////////////////////////////////////////////////////////////////////////////
-+#define MAXOF(T) PBU_MAXOF(T)
-+
-+///////////////////////////////////////////////////////////////////////////////
-+#define LIST_APPEND(l,n) PBU_LIST_APPEND(l,n)
-+#define LIST_NEXT(n,l) PBU_LIST_NEXT(n,l)
-+#define LIST_FOREACH(n,l) PBU_LIST_FOREACH(n,l)
-+
-+///////////////////////////////////////////////////////////////////////////////
-+typedef pbu_list_t list_t;
-+
-+#ifdef __cpluplus
-+}
-+#endif
-+#endif // }
-diff --git a/libpbutil/version.mak b/libpbutil/version.mak
-new file mode 100644
-index 0000000..7567eea
---- /dev/null
-+++ b/libpbutil/version.mak
-@@ -0,0 +1,19 @@
-+# version.mk
-+# Copyright (C) 2011, 2012 Peter Belkner <pbelkner at snafu.de>
-+#
-+# This library 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.
-+#
-+# This library 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 this library; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+# MA 02110-1301 USA
-+#
-+LIBPBUTIL_VERSION=0.1.0
diff --git a/debian/patches/02-bs1770gain-0.4.2.diff b/debian/patches/02-bs1770gain-0.4.2.diff
deleted file mode 100644
index dc22df4..0000000
--- a/debian/patches/02-bs1770gain-0.4.2.diff
+++ /dev/null
@@ -1,1017 +0,0 @@
-Index: bs1770gain-git/bs1770gain/bs1770gain_album.c
-===================================================================
---- bs1770gain-git.orig/bs1770gain/bs1770gain_album.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/bs1770gain/bs1770gain_album.c 2015-06-08 07:33:37.578450324 +0000
-@@ -59,10 +59,10 @@
- // cleanup:
- ffsox_aggregate_cleanup(&album->aggregate);
- aggregate:
-- if (NULL!=album->opath);
-+ if (NULL!=album->opath)
- free(album->opath);
- opath:
-- if (NULL!=album->ipath);
-+ if (NULL!=album->ipath)
- free(album->ipath);
- ipath:
- free(album);
-@@ -228,9 +228,9 @@
- ext=pbu_ext(track->ipath);
-
- if (0==(EXTENSION_RENAME&options->extensions)||NULL==de)
-- track->opath=bs1770gain_opath(track->ipath,odirname,ext,options);
-+ track->opath=bs1770gain_opath(track->ipath,odirname,ext);
- else
-- track->opath=bs1770gain_opathx(track->n,de->value,odirname,ext,options);
-+ track->opath=bs1770gain_opathx(track->n,de->value,odirname,ext);
-
- BS1770GAIN_GOTO(NULL==track->opath,"allocating output path",path);
- code=0;
-Index: bs1770gain-git/bs1770gain/bs1770gain.c
-===================================================================
---- bs1770gain-git.orig/bs1770gain/bs1770gain.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/bs1770gain/bs1770gain.c 2015-06-08 07:33:37.578450324 +0000
-@@ -46,6 +46,8 @@
- ///////////////////////////////////////////////////////////////////////////////
- void bs1770gain_usage(char **argv, int code)
- {
-+ fprintf(stderr,"BS1770GAIN, Copyright (C) Peter Belkner 2014, 2015.\n");
-+ fprintf(stderr,"\n");
- fprintf(stderr,"Usage: %s [options] <file/dir> [<file/dir> ...]\n",
- pbu_basename(argv[0]));
- fprintf(stderr,"\n");
-@@ -605,9 +607,12 @@
-
- if (options.time)
- fprintf(stderr, "Duration: %ld ms.\n",(t2-t1)/CLOCKS_PER_MILLIS);
--dynload:
-+
- if (NULL!=fpath)
- fclose(options.f);
- file:
-+ sox_quit();
-+ ffsox_unload();
-+dynload:
- return 0;
- }
-Index: bs1770gain-git/bs1770gain/bs1770gain.h
-===================================================================
---- bs1770gain-git.orig/bs1770gain/bs1770gain.h 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/bs1770gain/bs1770gain.h 2015-06-08 07:33:37.578450324 +0000
-@@ -46,9 +46,9 @@
-
- ///////////////////////////////////////////////////////////////////////////////
- char *bs1770gain_opath(const char *ipath, const char *odirname,
-- const char *oext, const bs1770gain_options_t *options);
-+ const char *oext);
- char *bs1770gain_opathx(int n, const char *title, const char *odirname,
-- const char *oext, const bs1770gain_options_t *options);
-+ const char *oext);
-
- int bs1770gain_transcode(bs1770gain_track_t *track,
- const bs1770gain_options_t *options);
-@@ -168,8 +168,8 @@
-
- int bs1770gain_tree_analyze(bs1770gain_tree_t *tree, const char *odirname,
- const bs1770gain_options_t *options);
--int bs1770gain_tree_track(bs1770gain_tree_t *tree, const char *odirname,
-- bs1770gain_album_t *album, const bs1770gain_options_t *options);
-+int bs1770gain_tree_track(bs1770gain_tree_t *tree, bs1770gain_album_t *album,
-+ const bs1770gain_options_t *options);
- int bs1770gain_tree_album(const bs1770gain_tree_t *root, const char *odirname,
- const bs1770gain_options_t *options);
-
-Index: bs1770gain-git/bs1770gain/bs1770gain_opath.c
-===================================================================
---- bs1770gain-git.orig/bs1770gain/bs1770gain_opath.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/bs1770gain/bs1770gain_opath.c 2015-06-08 07:33:37.578450324 +0000
-@@ -38,7 +38,7 @@
- }
-
- char *bs1770gain_opathx(int n, const char *title, const char *odirname,
-- const char *oext, const options_t *options)
-+ const char *oext)
- {
- char buf[32];
- int len1,len2,len3,len4;
-@@ -77,7 +77,7 @@
- }
-
- char *bs1770gain_opath(const char *ipath, const char *odirname,
-- const char *oext, const options_t *options)
-+ const char *oext)
- {
- const char *p1,*p2;;
- size_t len1,len2,len3;
-Index: bs1770gain-git/bs1770gain/bs1770gain_transcode.c
-===================================================================
---- bs1770gain-git.orig/bs1770gain/bs1770gain_transcode.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/bs1770gain/bs1770gain_transcode.c 2015-06-08 07:33:37.578450324 +0000
-@@ -160,8 +160,7 @@
- }
- }
-
--static void bs1770gain_write_dict(AVDictionary **ometadata,
-- AVDictionary *imetadata, tag_t *tags)
-+static void bs1770gain_write_dict(AVDictionary **ometadata,tag_t *tags)
- {
- tag_t *t;
-
-@@ -203,7 +202,7 @@
- bs1770gain_clone_dict(track,&sto->metadata,sti->metadata,tags,options);
- #if 0 // {
- if (ai==i)
-- bs1770gain_write_dict(&ost->metadata,ist->metadata,tags);
-+ bs1770gain_write_dict(&ost->metadata,tags);
- #endif // }
- }
- }
-@@ -280,7 +279,7 @@
- sample_fmt=-1;
- }
-
-- if (ffsox_source_link(&si,&so,drc,CODEC_ID,sample_fmt,q)<0) {
-+ if (ffsox_source_link_create(&si,&so,drc,CODEC_ID,sample_fmt,q)<0) {
- MESSAGE("creating link");
- goto link;
- }
-@@ -290,7 +289,7 @@
-
- if (BS1770GAIN_MODE_APPLY!=options->mode) {
- // set the RG/BWF tags.
-- bs1770gain_write_dict(&so.f.fc->metadata,si.f.fc->metadata,tags);
-+ bs1770gain_write_dict(&so.f.fc->metadata,tags);
- }
-
- if (ffsox_source_seek(&si,options->begin)<0) {
-@@ -323,6 +322,7 @@
- ffsox_sink_close(&so);
- open:
- seek:
-+ ffsox_source_link_cleanup(&si);
- link:
- ffsox_sink_cleanup(&so);
- so:
-Index: bs1770gain-git/bs1770gain/bs1770gain_tree.c
-===================================================================
---- bs1770gain-git.orig/bs1770gain/bs1770gain_tree.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/bs1770gain/bs1770gain_tree.c 2015-06-08 07:33:37.578450324 +0000
-@@ -77,7 +77,7 @@
- while (0<tree->vmt->next(tree,options)) {
- switch (tree->state) {
- case BS1770GAIN_TREE_STATE_REG:
-- BS1770GAIN_GOTO(bs1770gain_tree_track(tree,odirname,album,options)<0,
-+ BS1770GAIN_GOTO(bs1770gain_tree_track(tree,album,options)<0,
- "initializing track",track);
- break;
- case BS1770GAIN_TREE_STATE_DIR:
-@@ -165,8 +165,8 @@
- return code;
- }
-
--int bs1770gain_tree_track(bs1770gain_tree_t *tree, const char *odirname,
-- bs1770gain_album_t *album, const bs1770gain_options_t *options)
-+int bs1770gain_tree_track(bs1770gain_tree_t *tree, bs1770gain_album_t *album,
-+ const bs1770gain_options_t *options)
- {
- int code =-1;
-
-@@ -338,6 +338,7 @@
-
- void bs1770gain_tree_cli_cleanup(bs1770gain_tree_t *tree)
- {
-+ (void)tree;
- }
-
- int bs1770gain_tree_cli_next(bs1770gain_tree_t *tree,
-Index: bs1770gain-git/bs1770gain/configure
-===================================================================
---- bs1770gain-git.orig/bs1770gain/configure 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/bs1770gain/configure 2015-06-08 07:33:37.578450324 +0000
-@@ -63,6 +63,10 @@
- while test "$1" != ''; do
- case $1 in
- --help) help 0 ;;
-+ --os=*) os=`extract "$1" '--os'` ;;
-+ --bits=*) bits=`extract "$1" '--bits'` ;;
-+ --msvs=*) msvs=`extract "$1" '--msvs'` ;;
-+ --mssdk=*) mssdk=`extract "$1" '--mssdk'` ;;
- --prefix=*) pfx=`extract "$1" '--prefix'` ;;
- --bindir=*) bindir=`extract "$1" '--bindir'` ;;
- --libdir=*) libdir=`extract "$1" '--libdir'` ;;
-@@ -95,6 +99,7 @@
- pfx=`normpath "$pfx"`
- srcdir=`normpath "$srcdir"`
- reldir=`normpath "$reldir"`
-+#if [ 'x' = "x${bits}" ]; then bits=`"$srcdir"/bits`; fi
-
- ###############################################################################
- pfxpath() {
-@@ -124,6 +129,9 @@
- echo "HOST=$host" >> config.mak
- echo "ENABLE_STATIC=$enable_static" >> config.mak
- echo "ENABLE_SHARED=$enable_shared" >> config.mak
-+if [ 'x' != "x$bits" ]; then echo "BITS=$bits" >> config.mak; fi
-+if [ 'x' != "x$mssdk" ]; then echo "MSSDK=$mssdk" >> config.mak; fi
-+if [ 'x' != "x$msvs" ]; then echo "MSVS=$msvs" >> config.mak; fi
- if [ 'x' != "x$cflags" ]; then echo "CFLAGS+=$cflags" >> config.mak; fi
- if [ 'x' != "x$cppflags" ]; then echo "CPPFLAGS+=$cppflags" >> config.mak; fi
- if [ 'x' != "x$ldflags" ]; then echo "LDFLAGS+=$ldflags" >> config.mak; fi
-Index: bs1770gain-git/bs1770gain/Makefile
-===================================================================
---- bs1770gain-git.orig/bs1770gain/Makefile 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/bs1770gain/Makefile 2015-06-08 07:33:37.578450324 +0000
-@@ -3,12 +3,27 @@
- vpath % $(PWD) $(SRCDIR)
- .PHONY: all install clean
-
-+ifeq (msvc,$(OS)) # {
-+# https://msdn.microsoft.com/en-us/library/abx4dbyh.aspx
-+DOS2UX=$(shell echo '$(1)'|sed -e 's,\(.\):/,/\1/,g')
-+export PATH+=:$(call DOS2UX,$(MSVS))/Common7/IDE
-+MSVC=$(MSVS)/VC
-+CL='$(MSVC)/bin/cl'
-+
-+CFLAGS+=-nologo
-+CFLAGS+=-O2
-+CFLAGS+=-MD
-+CFLAGS+=-WX
-+
-+CPPFLAGS+=-D_MT
-+CPPFLAGS+=-D_DLL
-+CPPFLAGS+='-I$(MSVC)/include'
-+CPPFLAGS+='-I$(MSSDK)/include'
-+else # } {
- CC=gcc
--CPPFLAGS+=-I$(PWD)
--CPPFLAGS+=-I$(SRCDIR)
--CPPFLAGS+=-I$(INCLUDEDIR)
- CFLAGS+=-O2
- CFLAGS+=-Wall
-+CFLAGS+=-Wextra
- CFLAGS+=-Werror
- LDFLAGS+=-L$(PWD)
- LDFLAGS+=-L$(LIBDIR)
-@@ -16,31 +31,37 @@
- LDLIBS+=-ldl
- LDLIBS+=-lm
- endif # // }
-+endif # }
-+
-+CPPFLAGS+=-I$(PWD)
-+CPPFLAGS+=-I$(SRCDIR)
-+CPPFLAGS+=-I$(INCLUDEDIR)
-
- ALL+=bs1770gain
-+SOXDLLV=2
- all: $(ALL)
--ifeq (mingw,$(OS)) # // {
-+ifeq ($(filter $(OS),mingw msvc),$(OS)) # {
- all: bs1770gain-tools/avutil-54.dll
- all: bs1770gain-tools/swresample-1.dll
- all: bs1770gain-tools/avcodec-56.dll
- all: bs1770gain-tools/avformat-56.dll
--all: bs1770gain-tools/libsox-2.dll
-+all: bs1770gain-tools/libsox-$(SOXDLLV).dll
- install: $(BINDIR)/bs1770gain-tools/avutil-54.dll
- install: $(BINDIR)/bs1770gain-tools/swresample-1.dll
- install: $(BINDIR)/bs1770gain-tools/avcodec-56.dll
- install: $(BINDIR)/bs1770gain-tools/avformat-56.dll
--install: $(BINDIR)/bs1770gain-tools/libsox-2.dll
-+install: $(BINDIR)/bs1770gain-tools/libsox-$(SOXDLLV).dll
- else # } {
- all: bs1770gain-tools/libavutil.so.54
- all: bs1770gain-tools/libswresample.so.1
- all: bs1770gain-tools/libavcodec.so.56
- all: bs1770gain-tools/libavformat.so.56
--all: bs1770gain-tools/libsox.so.2
-+all: bs1770gain-tools/libsox.so.$(SOXDLLV)
- install: $(BINDIR)/bs1770gain-tools/libavutil.so.54
- install: $(BINDIR)/bs1770gain-tools/libswresample.so.1
- install: $(BINDIR)/bs1770gain-tools/libavcodec.so.56
- install: $(BINDIR)/bs1770gain-tools/libavformat.so.56
--install: $(BINDIR)/bs1770gain-tools/libsox.so.2
-+install: $(BINDIR)/bs1770gain-tools/libsox.so.$(SOXDLLV)
- endif # }
-
- LIBBS1770GAIN_H+=$(INCLUDEDIR)/pbutil.h
-@@ -65,13 +86,13 @@
- $(LIBBS1770GAIN_O) bs1770gain: $(LIBDIR)/lib1770-2.a
- $(LIBBS1770GAIN_O) bs1770gain: $(LIBDIR)/libpbutil.a
- install: all
--ifeq (mingw,$(OS))
-+ifeq ($(filter $(OS),mingw msvc),$(OS)) # {
- install: $(patsubst %,$(BINDIR)/%.exe,$(ALL))
- else
- install: $(patsubst %,$(BINDIR)/%,$(ALL))
- endif
-
--ifeq (mingw,$(OS)) # // {
-+ifeq ($(filter $(OS),mingw msvc),$(OS)) # {
- bs1770gain-tools/%: $(BINDIR)/%
- mkdir -p $(@D)
- cp $< $(@D)
-@@ -95,3 +116,15 @@
-
- clean:
- rm -f bs1770gain bs1770gain.exe *.a *.o
-+
-+###############################################################################
-+ifeq (msvc,$(OS)) # {
-+%.dll: %.obj
-+ $(CL) -LD $(CFLAGS) $(CPPFLAGS) -Fe$@ $^ -link $(LDFLAGS) $(LDLIBS)
-+%.exe: %.obj
-+ $(CL) $(CFLAGS) $(CPPFLAGS) -Fe$@ $^ -link $(LDFLAGS) $(LDLIBS)
-+%.obj: %.c
-+ $(CL) $(CFLAGS) $(CPPFLAGS) -c -Fo$@ $<
-+%.obj: %.cpp
-+ $(CL) $(CFLAGS) $(CPPFLAGS) -c -Fo$@ $<
-+endif # }
-Index: bs1770gain-git/bs1770gain/version.mak
-===================================================================
---- bs1770gain-git.orig/bs1770gain/version.mak 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/bs1770gain/version.mak 2015-06-08 07:33:37.578450324 +0000
-@@ -16,4 +16,4 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- # MA 02110-1301 USA
- #
--BS1770GAIN_VERSION=0.4.1
-+BS1770GAIN_VERSION=0.4.2
-Index: bs1770gain-git/configure
-===================================================================
---- bs1770gain-git.orig/configure 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/configure 2015-06-08 07:33:37.578450324 +0000
-@@ -65,6 +65,10 @@
- while test "$1" != ''; do
- case $1 in
- --help) help 0 ;;
-+ --os=*) os=`extract "$1" '--os'` ;;
-+ --bits=*) bits=`extract "$1" '--bits'` ;;
-+ --msvs=*) msvs=`extract "$1" '--msvs'` ;;
-+ --mssdk=*) mssdk=`extract "$1" '--mssdk'` ;;
- --prefix=*) pfx=`extract "$1" '--prefix'` ;;
- --bindir=*) bindir=`extract "$1" '--bindir'` ;;
- --libdir=*) libdir=`extract "$1" '--libdir'` ;;
-@@ -100,7 +104,7 @@
- pfx=`normpath "$pfx"`
- srcdir=`normpath "$srcdir"`
- reldir=`normpath "$reldir"`
--bits=`"$srcdir"/bits`
-+if [ 'x' = "x${bits}" ]; then bits=`"$srcdir"/bits`; fi
-
- ###############################################################################
- pfxpath() {
-@@ -120,6 +124,7 @@
- touch config.mak
-
- echo "OS=$os" >> config.mak
-+echo "BITS=$bits" >> config.mak
- echo "PREFIX=$pfx" >> config.mak
- echo "SRCDIR=$srcdir" >> config.mak
- echo "BINDIR=$bindir" >> config.mak
-@@ -133,6 +138,8 @@
- echo "ENABLE_STATIC=$enable_static" >> config.mak
- echo "ENABLE_SHARED=$enable_shared" >> config.mak
- echo "ENABLE_EXAMPLES=$enable_examples" >> config.mak
-+if [ 'x' != "x$mssdk" ]; then echo "MSSDK=$mssdk" >> config.mak; fi
-+if [ 'x' != "x$msvs" ]; then echo "MSVS=$msvs" >> config.mak; fi
- if [ 'x' != "x$cflags" ]; then echo "CFLAGS+=$cflags" >> config.mak; fi
- if [ 'x' != "x$cppflags" ]; then echo "CPPFLAGS+=$cppflags" >> config.mak; fi
- if [ 'x' != "x$ldflags" ]; then echo "LDFLAGS+=$ldflags" >> config.mak; fi
-Index: bs1770gain-git/lib1770-2/configure
-===================================================================
---- bs1770gain-git.orig/lib1770-2/configure 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/lib1770-2/configure 2015-06-08 07:33:37.582450342 +0000
-@@ -63,6 +63,8 @@
- while test "$1" != ''; do
- case $1 in
- --help) help 0 ;;
-+ --os=*) os=`extract "$1" '--os'` ;;
-+ --bits=*) bits=`extract "$1" '--bits'` ;;
- --prefix=*) pfx=`extract "$1" '--prefix'` ;;
- --bindir=*) bindir=`extract "$1" '--bindir'` ;;
- --libdir=*) libdir=`extract "$1" '--libdir'` ;;
-@@ -95,6 +97,7 @@
- pfx=`normpath "$pfx"`
- srcdir=`normpath "$srcdir"`
- reldir=`normpath "$reldir"`
-+#if [ 'x' = "x${bits}" ]; then bits=`"$srcdir"/bits`; fi
-
- ###############################################################################
- pfxpath() {
-@@ -124,6 +127,9 @@
- echo "HOST=$host" >> config.mak
- echo "ENABLE_STATIC=$enable_static" >> config.mak
- echo "ENABLE_SHARED=$enable_shared" >> config.mak
-+if [ 'x' != "x$bits" ]; then echo "BITS=$bits" >> config.mak; fi
-+if [ 'x' != "x$mssdk" ]; then echo "MSSDK=$mssdk" >> config.mak; fi
-+if [ 'x' != "x$msvs" ]; then echo "MSVS=$msvs" >> config.mak; fi
- if [ 'x' != "x$cflags" ]; then echo "CFLAGS+=$cflags" >> config.mak; fi
- if [ 'x' != "x$cppflags" ]; then echo "CPPFLAGS+=$cppflags" >> config.mak; fi
- if [ 'x' != "x$ldflags" ]; then echo "LDFLAGS+=$ldflags" >> config.mak; fi
-Index: bs1770gain-git/lib1770-2/lib1770_block.c
-===================================================================
---- bs1770gain-git.orig/lib1770-2/lib1770_block.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/lib1770-2/lib1770_block.c 2015-06-08 07:33:37.582450342 +0000
-@@ -79,7 +79,7 @@
- }
-
- if (++block->ring.count==block->overlap_size) {
-- int next_offs=block->ring.offs+1;
-+ size_t next_offs=block->ring.offs+1;
-
- if (next_offs==block->ring.size)
- next_offs=0;
-Index: bs1770gain-git/lib1770-2/Makefile
-===================================================================
---- bs1770gain-git.orig/lib1770-2/Makefile 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/lib1770-2/Makefile 2015-06-08 07:33:37.582450342 +0000
-@@ -8,6 +8,7 @@
- CPPFLAGS+=-I$(INCLUDEDIR)
- CFLAGS+=-O2
- CFLAGS+=-Wall
-+CFLAGS+=-Wextra
- CFLAGS+=-Werror
-
- LIB1770_A=lib1770-2.a
-Index: bs1770gain-git/libffsox-2/configure
-===================================================================
---- bs1770gain-git.orig/libffsox-2/configure 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/configure 2015-06-08 07:33:37.582450342 +0000
-@@ -63,6 +63,10 @@
- while test "$1" != ''; do
- case $1 in
- --help) help 0 ;;
-+ --os=*) os=`extract "$1" '--os'` ;;
-+ --bits=*) bits=`extract "$1" '--bits'` ;;
-+ --msvs=*) msvs=`extract "$1" '--msvs'` ;;
-+ --mssdk=*) mssdk=`extract "$1" '--mssdk'` ;;
- --prefix=*) pfx=`extract "$1" '--prefix'` ;;
- --bindir=*) bindir=`extract "$1" '--bindir'` ;;
- --libdir=*) libdir=`extract "$1" '--libdir'` ;;
-@@ -95,6 +99,7 @@
- pfx=`normpath "$pfx"`
- srcdir=`normpath "$srcdir"`
- reldir=`normpath "$reldir"`
-+#if [ 'x' = "x${bits}" ]; then bits=`"$srcdir"/bits`; fi
-
- ###############################################################################
- pfxpath() {
-@@ -124,6 +129,9 @@
- echo "HOST=$host" >> config.mak
- echo "ENABLE_STATIC=$enable_static" >> config.mak
- echo "ENABLE_SHARED=$enable_shared" >> config.mak
-+if [ 'x' != "x$bits" ]; then echo "BITS=$bits" >> config.mak; fi
-+if [ 'x' != "x$mssdk" ]; then echo "MSSDK=$mssdk" >> config.mak; fi
-+if [ 'x' != "x$msvs" ]; then echo "MSVS=$msvs" >> config.mak; fi
- if [ 'x' != "x$cflags" ]; then echo "CFLAGS+=$cflags" >> config.mak; fi
- if [ 'x' != "x$cppflags" ]; then echo "CPPFLAGS+=$cppflags" >> config.mak; fi
- if [ 'x' != "x$ldflags" ]; then echo "LDFLAGS+=$ldflags" >> config.mak; fi
-Index: bs1770gain-git/libffsox-2/ffsox_audiostream.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_audiostream.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_audiostream.c 2015-06-08 07:33:37.582450342 +0000
-@@ -46,7 +46,7 @@
- ai=-1;
- vi=-1;
-
-- for (i=0;i<fc->nb_streams;++i) {
-+ for (i=0;i<(int)fc->nb_streams;++i) {
- cc=fc->streams[i]->codec;
-
- if (ffsox_codec_blacklist(cc->codec_id))
-Index: bs1770gain-git/libffsox-2/ffsox_csv2avdict.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_csv2avdict.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_csv2avdict.c 2015-06-08 07:33:37.582450342 +0000
-@@ -255,7 +255,7 @@
- static unsigned short mask[] = {192, 224, 240};
-
- char *wp=b->ch;
-- int n;
-+ unsigned int n;
-
- // read first byte into buffer
- if (EOF==(*wp=getc(b->f)))
-Index: bs1770gain-git/libffsox-2/ffsox_dynload.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_dynload.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_dynload.c 2015-06-08 07:33:37.582450342 +0000
-@@ -18,7 +18,7 @@
- * MA 02110-1301 USA
- */
- #define FFSOX_DYNLOAD_PRIV
--#include <ffsox.h>
-+#include <ffsox_priv.h>
- #if defined (FFSOX_DYNLOAD) // {
- #if ! defined (WIN32) // {
- #include <unistd.h>
-@@ -48,6 +48,8 @@
-
- #define FFSOX_LIBSOX "libsox-" FFSOX_LIBSOX_V ".dll"
-
-+#define FFSOX_UNLOAD(lib) FreeLibrary(lib)
-+
- #define FFSOX_BIND(hLib,app,np) do { \
- if (NULL==(*(app)=(void *)GetProcAddress(hLib,np))) { \
- fprintf(stderr,"Error loding symbol \"%s\".\n",np); \
-@@ -149,6 +151,8 @@
-
- #define FFSOX_LIBSOX "libsox.so." FFSOX_LIBSOX_V
-
-+#define FFSOX_UNLOAD(lib) dlclose(lib)
-+
- #define FFSOX_BIND(lib,app,np) do { \
- if (NULL==(*(app)=dlsym(lib,np))) { \
- fprintf(stderr,"Error loding symbol \"%s\".\n",np); \
-@@ -285,15 +289,9 @@
-
- static int ffsox_dynload_swresample(void *lib)
- {
--#if 0 // {
-- int code=-1;
-+ (void)lib;
-
-- code=0;
--loadlib:
-- return code;
--#else // } {
- return 0;
--#endif // }
- }
-
- static int ffsox_dynload_avcodec(void *lib)
-@@ -380,6 +378,12 @@
- }
-
- ///////////////////////////////////////////////////////////////////////////////
-+static void *avutil;
-+static void *swresample;
-+static void *avcodec;
-+static void *avformat;
-+static void *libsox;
-+
- int ffsox_dynload(const char *dirname)
- {
- int code=-1;
-@@ -388,7 +392,6 @@
- #else // } {
- char *root;
- #endif // }
-- void *lib;
-
- if (NULL==dirname||'/'==dirname[0])
- root=NULL;
-@@ -400,38 +403,48 @@
- goto exit;
-
- /////////////////////////////////////////////////////////////////////////////
-- if (NULL==(lib=ffsox_loadlib(root,dirname,FFSOX_AVUTIL)))
-+ if (NULL==(avutil=ffsox_loadlib(root,dirname,FFSOX_AVUTIL))) {
-+ MESSAGE("loading avutil");
- goto root;
-+ }
-
-- if (ffsox_dynload_avutil(lib)<0)
-+ if (ffsox_dynload_avutil(avutil)<0)
- goto root;
-
- /////////////////////////////////////////////////////////////////////////////
-- if (NULL==(lib=ffsox_loadlib(root,dirname,FFSOX_SWRESAMPLE)))
-+ if (NULL==(swresample=ffsox_loadlib(root,dirname,FFSOX_SWRESAMPLE))) {
-+ MESSAGE("loading swresample");
- goto root;
-+ }
-
-- if (ffsox_dynload_swresample(lib)<0)
-+ if (ffsox_dynload_swresample(swresample)<0)
- goto root;
-
- /////////////////////////////////////////////////////////////////////////////
-- if (NULL==(lib=ffsox_loadlib(root,dirname,FFSOX_AVCODEC)))
-+ if (NULL==(avcodec=ffsox_loadlib(root,dirname,FFSOX_AVCODEC))) {
-+ MESSAGE("loading avcodec");
- goto root;
-+ }
-
-- if (ffsox_dynload_avcodec(lib)<0)
-+ if (ffsox_dynload_avcodec(avcodec)<0)
- goto root;
-
- /////////////////////////////////////////////////////////////////////////////
-- if (NULL==(lib=ffsox_loadlib(root,dirname,FFSOX_AVFORMAT)))
-+ if (NULL==(avformat=ffsox_loadlib(root,dirname,FFSOX_AVFORMAT))) {
-+ MESSAGE("loading avformat");
- goto root;
-+ }
-
-- if (ffsox_dynload_avformat(lib)<0)
-+ if (ffsox_dynload_avformat(avformat)<0)
- goto root;
-
- /////////////////////////////////////////////////////////////////////////////
-- if (NULL==(lib=ffsox_loadlib(root,dirname,FFSOX_LIBSOX)))
-+ if (NULL==(libsox=ffsox_loadlib(root,dirname,FFSOX_LIBSOX))) {
-+ MESSAGE("loading libsox");
- goto root;
-+ }
-
-- if (ffsox_dynload_libsox(lib)<0)
-+ if (ffsox_dynload_libsox(libsox)<0)
- goto root;
-
- code=0;
-@@ -441,4 +454,39 @@
- exit:
- return code;
- }
-+
-+void ffsox_unload(void)
-+{
-+#if 0 // {
-+ if (NULL!=libsox) {
-+ memset(&ffsox_libsox,0,sizeof ffsox_libsox);
-+ FFSOX_UNLOAD(libsox);
-+ libsox=NULL;
-+ }
-+
-+ if (NULL!=avformat) {
-+ memset(&ffsox_avformat,0,sizeof ffsox_avformat);
-+ FFSOX_UNLOAD(avformat);
-+ avformat=NULL;
-+ }
-+
-+ if (NULL!=avcodec) {
-+ memset(&ffsox_avcodec,0,sizeof ffsox_avcodec);
-+ FFSOX_UNLOAD(avcodec);
-+ avcodec=NULL;
-+ }
-+
-+ if (NULL!=swresample) {
-+ //memset(&ffsox_swresample,0,sizeof ffsox_swresample);
-+ FFSOX_UNLOAD(swresample);
-+ swresample=NULL;
-+ }
-+
-+ if (NULL!=avutil) {
-+ memset(&ffsox_avutil,0,sizeof ffsox_avutil);
-+ FFSOX_UNLOAD(avutil);
-+ avutil=NULL;
-+ }
-+#endif // }
-+}
- #endif // }
-Index: bs1770gain-git/libffsox-2/ffsox_dynload.h
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_dynload.h 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_dynload.h 2015-06-08 07:33:37.582450342 +0000
-@@ -126,6 +126,7 @@
-
- ///////////////////////////////////////////////////////////////////////////////
- int ffsox_dynload(const char *dirname);
-+void ffsox_unload(void);
-
- #if ! defined (FFSOX_DYNLOAD_PRIV) // {
- ///////////////////////////////////////////////////////////////////////////////
-Index: bs1770gain-git/libffsox-2/ffsox.h
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox.h 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox.h 2015-06-08 07:34:35.958681058 +0000
-@@ -395,8 +395,9 @@
- int ffsox_source_append(ffsox_source_t *si, ffsox_packet_consumer_t *pc);
- int ffsox_source_seek(ffsox_source_t *n, int64_t ts);
-
--int ffsox_source_link(ffsox_source_t *si, ffsox_sink_t *so, double drc,
-+int ffsox_source_link_create(ffsox_source_t *si, ffsox_sink_t *so, double drc,
- int codec_id, int sample_fmt, double q);
-+void ffsox_source_link_cleanup(ffsox_source_t *si);
- void ffsox_source_progress(const ffsox_source_t *si, /* FILE */void *data);
-
- /// packet_consumer ///////////////////////////////////////////////////////////
-Index: bs1770gain-git/libffsox-2/ffsox_node.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_node.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_node.c 2015-06-08 07:33:37.582450342 +0000
-@@ -38,21 +38,26 @@
- ////////
- static void node_cleanup(node_t *n)
- {
-+ (void)n;
- }
-
- static node_t *node_prev(node_t *n)
- {
-+ (void)n;
- return NULL;
- }
-
- static node_t *node_next(node_t *n)
- {
-+ (void)n;
-+
- return NULL;
- }
-
- static int node_run(node_t *n)
- {
- MESSAGE("running node");
-+ (void)n;
-
- return -1;
- }
-Index: bs1770gain-git/libffsox-2/ffsox_packet_consumer.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_packet_consumer.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_packet_consumer.c 2015-06-08 07:33:37.582450342 +0000
-@@ -58,6 +58,8 @@
- static int packet_consumer_set_packet(packet_consumer_t *pc, AVPacket *pkt)
- {
- MESSAGE("not implemented");
-+ (void)pc;
-+ (void)pkt;
-
- return -1;
- }
-Index: bs1770gain-git/libffsox-2/ffsox_source.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_source.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_source.c 2015-06-08 07:33:37.586450359 +0000
-@@ -122,9 +122,8 @@
- ////////
- static void source_cleanup(source_t *n)
- {
-- pbu_list_free_full(n->consumer.h,ffsox_packet_consumer_list_free);
-- n->consumer.h=NULL;
-- n->consumer.n=NULL;
-+ if (NULL!=n->consumer.h)
-+ ffsox_source_link_cleanup(n);
-
- avformat_close_input(&n->f.fc);
- vmt.parent->cleanup(&n->node);
-@@ -145,6 +144,7 @@
- case STATE_RUN:
- for (;;) {
- n->consumer.n=n->consumer.h;
-+ av_free_packet(pkt);
-
- if (av_read_frame(n->f.fc,pkt)<0) {
- n->state=STATE_FLUSH;
-@@ -176,8 +176,6 @@
-
- LIST_NEXT(&n->consumer.n,n->consumer.h);
- }
--
-- av_free_packet(pkt);
- }
- case STATE_FLUSH:
- flush:
-Index: bs1770gain-git/libffsox-2/ffsox_source_link.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_source_link.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_source_link.c 2015-06-08 07:33:37.586450359 +0000
-@@ -63,12 +63,12 @@
- return -1;
- }
-
--int ffsox_source_link(source_t *si, sink_t *so, double drc, int codec_id,
-+int ffsox_source_link_create(source_t *si, sink_t *so, double drc, int codec_id,
- int sample_fmt, double q)
- {
- int i;
-
-- for (i=0;i<si->f.fc->nb_streams;++i) {
-+ for (i=0;i<(int)si->f.fc->nb_streams;++i) {
- if (si->ai==i||si->vi==i) {
- if (si->vi==i||q<0.0) {
- if (ffsox_source_link_copy(si,so,i)<0) {
-@@ -89,3 +89,10 @@
- link:
- return -1;
- }
-+
-+void ffsox_source_link_cleanup(source_t *si)
-+{
-+ pbu_list_free_full(si->consumer.h,ffsox_packet_consumer_list_free);
-+ si->consumer.h=NULL;
-+ si->consumer.n=NULL;
-+}
-Index: bs1770gain-git/libffsox-2/ffsox_sox_pull_handler.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_sox_pull_handler.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_sox_pull_handler.c 2015-06-08 07:33:37.586450359 +0000
-@@ -47,6 +47,8 @@
- double scale;
- sox_sample_t const *rp,*mp;
-
-+ (void)obuf;
-+
- if (NULL!=cb) {
- data=priv->data;
- scale=1.0/MAXOF(*rp);
-Index: bs1770gain-git/libffsox-2/Makefile
-===================================================================
---- bs1770gain-git.orig/libffsox-2/Makefile 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/Makefile 2015-06-08 07:33:37.586450359 +0000
-@@ -8,6 +8,7 @@
- CPPFLAGS+=-I$(INCLUDEDIR)
- CFLAGS+=-O2
- CFLAGS+=-Wall
-+CFLAGS+=-Wextra
- CFLAGS+=-Werror
- #LDFLAGS+=-L$(LIBDIR)
- #LDLIBS+=-lavformat
-Index: bs1770gain-git/libffsox-2/mux1.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/mux1.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/mux1.c 2015-06-08 07:33:37.586450359 +0000
-@@ -52,7 +52,7 @@
- goto so;
- }
-
-- if (ffsox_source_link(&si,&so,0.0,CODEC_ID,SAMPLE_FMT,q)<0) {
-+ if (ffsox_source_link_create(&si,&so,0.0,CODEC_ID,SAMPLE_FMT,q)<0) {
- PBU_MESSAGE("creating link");
- goto link;
- }
-@@ -74,6 +74,7 @@
- machine:
- ffsox_sink_close(&so);
- open:
-+ ffsox_source_link_cleanup(&si);
- link:
- ffsox_sink_cleanup(&so);
- so:
-Index: bs1770gain-git/libffsox-2/mux2.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/mux2.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/mux2.c 2015-06-08 07:33:37.586450359 +0000
-@@ -112,6 +112,8 @@
- sox_format_t *out=priv->out;
- size_t len;
-
-+ (void)obuf;
-+
- /* Write out *isamp samples */
- len=sox_write(out, ibuf, *isamp);
-
-Index: bs1770gain-git/libffsox-2/wasapi.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/wasapi.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libffsox-2/wasapi.c 2015-06-08 07:33:37.586450359 +0000
-@@ -291,7 +291,7 @@
- return hr;
- }
-
--int main(int argc, char **argv)
-+int main()
- {
- HRESULT hr;
- IMMDeviceEnumerator *pEnumerator;
-Index: bs1770gain-git/libpbutil/Makefile
-===================================================================
---- bs1770gain-git.orig/libpbutil/Makefile 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libpbutil/Makefile 2015-06-08 07:33:37.586450359 +0000
-@@ -8,6 +8,7 @@
- CPPFLAGS+=-I$(INCLUDEDIR)
- CFLAGS+=-O2
- CFLAGS+=-Wall
-+CFLAGS+=-Wextra
- CFLAGS+=-Werror
-
- LIBPBUTIL_H+=pbutil.h
-Index: bs1770gain-git/libpbutil/pbu_copy_file.c
-===================================================================
---- bs1770gain-git.orig/libpbutil/pbu_copy_file.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libpbutil/pbu_copy_file.c 2015-06-08 07:33:37.586450359 +0000
-@@ -55,23 +55,18 @@
- if (NULL==(f1=fopen(src,"rb")))
- goto f1;
-
-- if (NULL==(f2=fopen(src,"wb")))
-+ if (NULL==(f2=fopen(dst,"wb")))
- goto f2;
-
- if (NULL==(buf=malloc(SIZE)))
- goto buf;
-
-- for (;;) {
-- if ((size=fread(buf,SIZE,1,f1))<SIZE) {
-- if (feof(f1))
-- break;
-- else
-- goto read;
-- }
-- }
-+ do {
-+ size=fread(buf,1,SIZE,f1);
-+ } while (size==fwrite(buf,1,size,f2)&&!feof(f1));
-
- code=0;
--read:
-+//read:
- free(buf);
- buf:
- fclose(f2);
-Index: bs1770gain-git/libpbutil/pbu_strtok.c
-===================================================================
---- bs1770gain-git.orig/libpbutil/pbu_strtok.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libpbutil/pbu_strtok.c 2015-06-08 07:33:37.586450359 +0000
-@@ -22,6 +22,8 @@
-
- static char *pbu_strtok(char *str, const char *delim, char **saveptr)
- {
-+ (void)saveptr;
-+
- return strtok(str,delim);
- }
-
-Index: bs1770gain-git/libpbutil/pbu_wcstok.c
-===================================================================
---- bs1770gain-git.orig/libpbutil/pbu_wcstok.c 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/libpbutil/pbu_wcstok.c 2015-06-08 07:33:37.586450359 +0000
-@@ -23,6 +23,8 @@
- static wchar_t *pbu_wcstok(wchar_t *str, const wchar_t *delim,
- wchar_t **saveptr)
- {
-+ (void)saveptr;
-+
- return wcstok(str,delim);
- }
-
-Index: bs1770gain-git/Makefile
-===================================================================
---- bs1770gain-git.orig/Makefile 2015-06-08 07:33:37.590450375 +0000
-+++ bs1770gain-git/Makefile 2015-06-08 07:33:37.586450359 +0000
-@@ -3,6 +3,7 @@
- include $(SRCDIR)/examples/version.mak
- include $(SRCDIR)/libffsox-2/version.mak
- include $(SRCDIR)/lib1770-2/version.mak
-+include $(SRCDIR)/libpbutil/version.mak
-
- .PHONY: all install release-bin release-src release-tools
-
-@@ -36,12 +37,13 @@
-
- ########
- SOXV=14.4.1
-+SOXDLLV=2
- SOX=sox-$(SOXV)
- SOX_INSTALL+=$(INCLUDEDIR)/sox.h
- ifeq (mingw,$(OS))
--SOX_INSTALL+=$(BINDIR)/libsox-2.dll
-+SOX_INSTALL+=$(BINDIR)/libsox-$(SOXDLLV).dll
- else
--SOX_INSTALL+=$(LIBDIR)/libsox.so.2
-+SOX_INSTALL+=$(LIBDIR)/libsox.so.$(SOXDLLV)
- endif
- #install: $(SOX_INSTALL)
-
-@@ -154,7 +156,6 @@
-
- ###############################################################################
- SOX_OPTS+=--prefix=$(PREFIX)
--SOX_OPTS+=--disable-gomp
- SOX_OPTS+=--with-gnu-ld
- SOX_OPTS+=--without-ladspa
- SOX_OPTS+=--without-ffmpeg
-@@ -163,8 +164,11 @@
- SOX_OPTS+='CPPFLAGS=-I$(INCLUDEDIR)'
- SOX_OPTS+='LDFLAGS=-L$(LIBDIR)'
- ifeq (mingw,$(OS)) # {
-+SOX_OPTS+=--disable-gomp
-+#SOX_OPTS+=--disable-openmp
- SOX_OPTS+=--disable-symlinks
- SOX_OPTS+=--disable-shared
-+#SOX_OPTS+=CFLAGS=-fno-stack-protector
- ifeq (mingw,$(OS)) # {
- SOX_LIBS+=-lFLAC
- SOX_LIBS+=-lvorbisfile
-@@ -392,6 +396,7 @@
- RELEASE_SRC+=bits
- RELEASE_SRC+=configure
- RELEASE_SRC+=Makefile
-+RELEASE_SRC+=libpbutil
- RELEASE_SRC+=libffsox-2
- RELEASE_SRC+=lib1770-2
- RELEASE_SRC+=examples
-@@ -420,8 +425,8 @@
-
- ###############################################################################
- ifeq (mingw,$(OS)) # {
--.PRECIOUS: %-2.dll
--%-2.dll: %.dll
-+.PRECIOUS: %-$(SOXDLLV).dll
-+%-$(SOXDLLV).dll: %.dll
- cp $< $@
-
- .PRECIOUS: $(LIBDIR)/%.dll.a $(LIBDIR)/%.def
-@@ -439,6 +444,9 @@
- endif # }
- endif # }
-
-+ifeq (msvc,$(OS)) # {
-+endif # }
-+
- ###############################################################################
- .PHONY: FORCE
- FORCE:
diff --git a/debian/patches/11-autotools.diff b/debian/patches/10-autotools.diff
similarity index 100%
rename from debian/patches/11-autotools.diff
rename to debian/patches/10-autotools.diff
diff --git a/debian/patches/22-disable-dynload.diff b/debian/patches/20-disable-dynload.diff
similarity index 100%
rename from debian/patches/22-disable-dynload.diff
rename to debian/patches/20-disable-dynload.diff
diff --git a/debian/patches/series b/debian/patches/series
index 01fa710..a594e14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-01-libpbutil.diff
-02-bs1770gain-0.4.2.diff
-11-autotools.diff
-22-disable-dynload.diff
+10-autotools.diff
+20-disable-dynload.diff
--
bs1770gain packaging
More information about the pkg-multimedia-commits
mailing list