Hello community,
here is the log from the commit of package media-player-info for
openSUSE:Factory checked in at 2020-06-23 21:02:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/media-player-info (Old)
and /work/SRC/openSUSE:Factory/.media-player-info.new.2956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "media-player-info"
Tue Jun 23 21:02:14 2020 rev:28 rq:816501 version:24
Changes:
--------
--- /work/SRC/openSUSE:Factory/media-player-info/media-player-info.changes
2019-06-17 10:31:57.593307451 +0200
+++
/work/SRC/openSUSE:Factory/.media-player-info.new.2956/media-player-info.changes
2020-06-23 21:02:29.277435279 +0200
@@ -1,0 +2,10 @@
+Tue Jun 16 06:52:16 UTC 2020 - Martin Pluskal <[email protected]>
+
+- Update to version 24:
+ * Move to new freedesktop GitLab repository, update README.md
+ accordingly
+ * Drop non-hwdb mode, require udev 196 now
+ * Several build system cleanups and robustifications
+- Drop reproducible.patch
+
+-------------------------------------------------------------------
Old:
----
media-player-info-23.tar.gz
reproducible.patch
New:
----
media-player-info-24.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ media-player-info.spec ++++++
--- /var/tmp/diff_new_pack.3B5hc0/_old 2020-06-23 21:02:30.053437776 +0200
+++ /var/tmp/diff_new_pack.3B5hc0/_new 2020-06-23 21:02:30.053437776 +0200
@@ -1,7 +1,7 @@
#
# spec file for package media-player-info
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,8 @@
%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
-
Name: media-player-info
-Version: 23
+Version: 24
Release: 0
Summary: Media Player Information
# Note on license: some files in the tools subdirectories are GPL-2.0+ (or
@@ -27,17 +26,12 @@
# Hence, the binary package is indeed still BSD-3-Clause.
License: BSD-3-Clause
Group: System/GUI/Other
-Url: http://hal.freedesktop.org/releases/
-Source:
http://www.freedesktop.org/software/media-player-info/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM reproducible.patch [email protected] -- Make build
reproducible.
-Patch0: reproducible.patch
-BuildRequires: pkg-config
+URL: https://www.freedesktop.org/wiki/Software/media-player-info/
+Source:
https://www.freedesktop.org/software/media-player-info/%{name}-%{version}.tar.gz
+BuildRequires: pkgconfig
BuildRequires: python3
-BuildRequires: pkgconfig(udev)
-%if 0%{?suse_version} > 1230
BuildRequires: pkgconfig(systemd)
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: pkgconfig(udev)
BuildArch: noarch
%description
@@ -49,38 +43,31 @@
of the big HALectomy.
%prep
-%setup -q
-%patch0 -p1
+%autosetup
%build
%configure
-make %{?jobs:-j%jobs}
+%make_build
%install
-%makeinstall
+%make_install
-%if 0%{?suse_version} > 1230
%post
-%udev_hwdb_update
+%{udev_hwdb_update}
%udev_rules_update
%postun
if [ $1 -eq 0 ]; then
- %udev_hwdb_update
+ %{udev_hwdb_update}
%udev_rules_update
fi
-%endif
%files
-%defattr(-, root, root)
-%doc AUTHORS COPYING NEWS README
-## WARNING: if adding other files to the package, check their license (see
note above License tag)
+%license COPYING
+%doc AUTHORS NEWS
%dir %{_datadir}/media-player-info
%{_datadir}/media-player-info/*.mpi
-%if 0%{?suse_version} > 1230
%{_udevhwdbdir}/20-usb-media-players.hwdb
-%endif
%{_udevrulesdir}/40-usb-media-players.rules
-## WARNING: if adding other files to the package, check their license (see
note above License tag)
%changelog
++++++ media-player-info-23.tar.gz -> media-player-info-24.tar.gz ++++++
++++ 3495 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/INSTALL new/media-player-info-24/INSTALL
--- old/media-player-info-23/INSTALL 2017-02-10 07:47:11.000000000 +0100
+++ new/media-player-info-24/INSTALL 1970-01-01 01:00:00.000000000 +0100
@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
-
- Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved. This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
- Briefly, the shell command `./configure && make && make install'
-should configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package. Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below. The lack of an optional feature in a given package is not
-necessarily a bug. More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package, generally using the just-built uninstalled binaries.
-
- 4. Type `make install' to install the programs and any data files and
- documentation. When installing into a prefix owned by root, it is
- recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
- privileges.
-
- 5. Optionally, type `make installcheck' to repeat any self-tests, but
- this time using the binaries in their final installed location.
- This target does not install anything. Running this target as a
- regular user, particularly if the prior `make install' required
- root privileges, verifies that the installation completed
- correctly.
-
- 6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 7. Often, you can also type `make uninstall' to remove the installed
- files again. In practice, not all packages have tested that
- uninstallation works correctly, even though it is required by the
- GNU Coding Standards.
-
- 8. Some packages, particularly those that use Automake, provide `make
- distcheck', which can by used by developers to test that all other
- targets like `make install' and `make uninstall' work correctly.
- This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'. This
-is known as a "VPATH" build.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
-this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
- This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them. In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
- The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
- The first method involves providing an override variable for each
-affected directory. For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'. Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated. The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
- The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names. The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters. On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
- Some packages offer the ability to configure how verbose the
-execution of `make' will be. For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
- HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved. Use GNU `make'
-instead.
-
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
-
- ./configure CC="cc"
-
-and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
- On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS
- KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
- Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation. Until the limitation is lifted, you can use
-this workaround:
-
- CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
- `configure' recognizes the following options to control how it
-operates.
-
-`--help'
-`-h'
- Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
- Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`--prefix=DIR'
- Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
-`--no-create'
-`-n'
- Run the configure checks, but stop before creating any output
- files.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/Makefile.am new/media-player-info-24/Makefile.am
--- old/media-player-info-23/Makefile.am 2010-08-24 12:02:49.000000000
+0200
+++ new/media-player-info-24/Makefile.am 2018-08-20 23:30:52.000000000
+0200
@@ -1,2 +1,26 @@
-SUBDIRS=media-players tools
DISTCHECK_CONFIGURE_FLAGS = --with-udevdir='$${libdir}/udev-distcheck'
+
+mpidir = $(datadir)/media-player-info
+dist_mpi_DATA = $(shell find $(top_srcdir)/media-players -name "*.mpi"
-printf "%p\n" | LC_ALL=C sort)
+
+udevrulesdir = $(UDEV_DIR)/rules.d
+nodist_udevrules_DATA = 40-usb-media-players.rules
+
+40-usb-media-players.rules: $(dist_mpi_DATA) $(top_srcdir)/tools/mpi2udev.py
+ $(PYTHON) $(top_srcdir)/tools/mpi2udev.py $(dist_mpi_DATA) >
40-usb-media-players.rules
+ $(PYTHON) $(top_srcdir)/tools/udev-syntax-check.py
40-usb-media-players.rules
+
+udevhwdbdir = $(UDEV_DIR)/hwdb.d
+nodist_udevhwdb_DATA = 20-usb-media-players.hwdb
+
+20-usb-media-players.hwdb: $(dist_mpi_DATA) $(top_srcdir)/tools/mpi2hwdb.py
+ $(PYTHON) $(top_srcdir)/tools/mpi2hwdb.py $(dist_mpi_DATA) >
20-usb-media-players.hwdb
+
+clean-local:
+ rm -f 40-usb-media-players.rules 20-usb-media-players.hwdb
+
+EXTRA_DIST = \
+ tools/COPYING \
+ tools/mpi2udev.py \
+ tools/mpi2hwdb.py \
+ tools/udev-syntax-check.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/NEWS new/media-player-info-24/NEWS
--- old/media-player-info-23/NEWS 2017-09-15 14:32:03.000000000 +0200
+++ new/media-player-info-24/NEWS 2018-08-21 14:36:21.000000000 +0200
@@ -1,3 +1,10 @@
+media-player-info 24 (2018-08-21)
+=================================
+Martin Pitt:
+ Move to new freedesktop GitLab repository, update README.md accordingly
+ Drop non-hwdb mode, require udev 196 now
+ Several build system cleanups and robustifications
+
media-player-info 23 (2017-09-15)
=================================
Bastien Nocera:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/README new/media-player-info-24/README
--- old/media-player-info-23/README 2011-11-23 08:28:56.000000000 +0100
+++ new/media-player-info-24/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,118 +0,0 @@
-INTRODUCTION
-============
-
-media-player-info is a repository of data files describing media player
-(only USB Mass Storage ones) capabilities. These files contain information
-about the directory layout to use to add music to these devices, about the
-supported file formats, ... These capabilities used to be provided by HAL
-in the 10-usb-music-players.fdi file but had to be moved elsewhere as part
-of the big HALectomy.
-
-The music player capabilities are now described in .mpi files (which are
-.ini-like files) which you can find in media-players/. These mpi files are
-used to generate an udev rule to identify these devices. This rule associate
-an ID_MEDIA_PLAYER attribute to the media player devices. This attribute
-specifies the name of the .mpi file to use to find out the device
-capabilities. The .mpi can then be looked up in
$XDG_DATA_DIRS/media-player-info
-(see the XDG Base Directory Specification for more information about what
-this means).
-
-Both the mpi files and the udev rule have to be installed on the system.
-Indeed, the udev rule only contain what is strictly necessary, ie it only
-matches media player devices and set an ID_MEDIA_PLAYER udev property on
-the device. This property contains the name of the mpi file. It's up to
-applications needing detailed information about media players (like the audio
-formats they support, ...) to parse this file and extract whatever is necessary
-from it. The media player information isn't included directly in udev database
-because not many apps need it, and because we didn't want to repeat the same
-mistakes as HAL and include everything in its database.
-
-If you encounter an USB Mass Storage device that isn't detected correctly,
-please open a bug against media-player-info :
-https://bugs.freedesktop.org/enter_bug.cgi?product=media-player-info
-
-
-MPI FILE FORMAT
-===============
-
-Each mpi file is separated in several sections:
-- [Device] (only mandatory section)
-- [Media]
-- [Playlist]
-- [storage]
-
-
-The [Device] section contains information about the media player:
-- Product: human-readable product (device) name
-- Vendor: human-readable vendor name
-- AccessProtocol: the way this device is accessed. For now the only
- supported value is "storage" for USB mass storage devices.
-- Icon: (optional) Icon name to use instead of the default "media-player".
-
-For actually identifying a player from hardware information in /sys, there are
-two possibilities:
-
-- DeviceMatch field: semi-colon separated list of "usb:<vid>:<pid>" values
- (<vid> is the USB vendor ID, <pid> is the USB product ID). This lists all the
- USB that are described by the current mpi file.
-
-- A combination of "USBVendor", "USBProduct", "USBModel", and "USBManufacturer"
- strings (which map to the corresponding sysfs fields). You can use the '*'
- wildcard. See apple-ipod.mpi for an example.
-
-The [Media] section describes in more details which media formats the player
-supports. For now it only describes audio capabilities, but video or artwork
-capabilities might be added in the future. Each entry in the Media section
-is a semi-colon-separated list of media mime types (audio/mpeg, audio/x-wav,
-...).
-- InputFormats: audio formats the media player can record to
-- OutputFormats: audio formats the media player can play back
-
-
-The [Playlist] section describes the player playlist capabilites. If it's
-absent, it means the player doesn't support playlists (or that the information
-contained in media-player-info is incomplete, in such a case, please email us
-or file a bug).
-- Formats: a semi-colon-separated list of the mime-types of the
- playlist formats supported by the device
-- FolderSeparator: separator between directory/file names in playlist files. If
- not given, "Unix" is assumed, which uses '/'. Some players require
- "DOS", which will use '\'. Other values are invalid and will be ignored.
-- LineEnding: line separator in playlist files. This can have the values 'CR',
- 'LF', or 'CRLF', which correspond to 0x0D (\r), 0x0A (\n), and 0x0D0A (\r\n)
- respectively. If not given, the default behaviour depends on the music player
- software.
-
-The [storage] section describes the location where media files can be found and
-have to be stored.
-- AudioFolders: a semi-colon-separeted list of directories where audio files
- can be found and must be stored
-- PlaylistPath: describes where and how the playlist files can be found and
- have to be stored
-- RequiresEject: the eject ioctl is required to properly eject the media
-- FolderDepth: this tells applications exactly how deep of directory
- hierarchies files should be placed in. If the device does not have a
- limit, do not set this property.
-
-
-MPI FILESÂ NAMING CONVENTION
-===========================
-The current naming convention for .mpi file is as follows :
-
-<vendor>_<device>.mpi
-
-Where :
-- <vendor> is the official name of the device's manufacturer. If the same
- usb id is used by different market names, use the manufacturer name from
- usb.ids/lsusb. If vendor name has more than one word, words are separated by
- '-'
-- <device> is the official name of the device. If the same .mpi file matches
- more than one device, you can separate devices with extra "_". If the .mpi
- file matches a lot of different market names, you can use 0x1111 where 1111
- is the product id of the device (in this case, use a generic name inside the
- .mpi file (e.g. "Mobile phone", "Media player"). If device name has more than
- one word, words are separated by '-'
-
-Please note that these conventions are not absolute rules but we try to keep
-the naming coherant.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/configure.ac new/media-player-info-24/configure.ac
--- old/media-player-info-23/configure.ac 2017-09-15 14:32:26.000000000
+0200
+++ new/media-player-info-24/configure.ac 2018-08-21 14:36:31.000000000
+0200
@@ -1,8 +1,10 @@
-AC_INIT(media-player-info, 23, [email protected])
-AM_INIT_AUTOMAKE
+AC_INIT(media-player-info, 24, [email protected])
+AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([media-players/])
-PKG_CHECK_MODULES(UDEV, udev)
+# require hwdb support
+PKG_CHECK_MODULES(UDEV, udev >= 196)
+
AC_ARG_WITH(udevdir,
AS_HELP_STRING([--with-udevdir=DIR],[Installation path for udev
rules @<:@auto@:>@]),
[ac_with_udevdir=$withval],
@@ -11,20 +13,10 @@
ac_with_udevdir=`$PKG_CONFIG --variable=udevdir udev`
fi
-# supports hwdb?
-AM_CONDITIONAL([HAVE_HWDB], [pkg-config --atleast-version=196 udev])
-
-AC_CHECK_PROG([PYTHON], [python3], [python3])
-if test "x$PYTHON" = "x"; then
- AC_MSG_ERROR([python3 not found])
-fi
+AM_PATH_PYTHON([3])
AC_MSG_NOTICE([installing udev rules in ${ac_with_udevdir}/rules.d])
AC_SUBST([UDEV_DIR],[${ac_with_udevdir}])
-AC_OUTPUT([
-Makefile
-tools/Makefile
-media-players/Makefile
-])
-
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/media-players/Makefile.am
new/media-player-info-24/media-players/Makefile.am
--- old/media-player-info-23/media-players/Makefile.am 2016-06-26
21:09:16.000000000 +0200
+++ new/media-player-info-24/media-players/Makefile.am 1970-01-01
01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-mpidir = $(datadir)/media-player-info
-dist_mpi_DATA = $(shell find $(top_srcdir)/media-players -name "*.mpi"
-printf "%p\n" | LC_ALL=C sort)
-
-udevrulesdir = $(UDEV_DIR)/rules.d
-nodist_udevrules_DATA = 40-usb-media-players.rules
-40-usb-media-players.rules: $(dist_mpi_DATA) $(top_srcdir)/tools/mpi2udev.py
-if HAVE_HWDB
- $(top_srcdir)/tools/mpi2udev.py hwdb $(dist_mpi_DATA) >
40-usb-media-players.rules
-else
- $(top_srcdir)/tools/mpi2udev.py udev $(dist_mpi_DATA) >
40-usb-media-players.rules
-endif
- $(top_srcdir)/tools/udev-syntax-check.py 40-usb-media-players.rules
-
-if HAVE_HWDB
-udevhwdbdir = $(UDEV_DIR)/hwdb.d
-nodist_udevhwdb_DATA = 20-usb-media-players.hwdb
-20-usb-media-players.hwdb: $(dist_mpi_DATA) $(top_srcdir)/tools/mpi2hwdb.py
- $(top_srcdir)/tools/mpi2hwdb.py $(dist_mpi_DATA) >
20-usb-media-players.hwdb
-endif
-
-clean-local:
- rm -f 40-usb-media-players.rules 20-usb-media-players.hwdb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/missing new/media-player-info-24/missing
--- old/media-player-info-23/missing 2017-02-10 07:47:11.000000000 +0100
+++ new/media-player-info-24/missing 2018-07-18 22:49:47.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# 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/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/tools/Makefile.am
new/media-player-info-24/tools/Makefile.am
--- old/media-player-info-23/tools/Makefile.am 2013-07-23 08:59:37.000000000
+0200
+++ new/media-player-info-24/tools/Makefile.am 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-EXTRA_DIST = COPYING mpi2udev.py mpi2hwdb.py udev-syntax-check.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/tools/mpi2hwdb.py
new/media-player-info-24/tools/mpi2hwdb.py
--- old/media-player-info-23/tools/mpi2hwdb.py 2017-09-15 14:24:01.000000000
+0200
+++ new/media-player-info-24/tools/mpi2hwdb.py 2018-08-20 23:30:52.000000000
+0200
@@ -17,7 +17,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import sys, configparser, os.path, os
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/tools/mpi2udev.py
new/media-player-info-24/tools/mpi2udev.py
--- old/media-player-info-23/tools/mpi2udev.py 2013-09-30 14:10:09.000000000
+0200
+++ new/media-player-info-24/tools/mpi2udev.py 2018-08-20 23:30:52.000000000
+0200
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import sys, configparser, os.path, os
@@ -30,7 +30,7 @@
'usbmanufacturer': 'ATTRS{manufacturer}=="%s"',
}
-def parse_mpi(mpi, hwdb):
+def parse_mpi(mpi):
'''Print udev rule for given ConfigParser object.'''
cp = configparser.RawConfigParser()
@@ -46,9 +46,8 @@
continue
- # if using hwdb and no info other than idVendor+idProduct was found, we
don't need to write
- # an udev rule
- if hwdb and not rule:
+ # if no info other than idVendor+idProduct was found, we don't need to
write an udev rule
+ if not rule:
return
try:
@@ -113,17 +112,9 @@
''')
-# the first argument should be "hwdb" or "udev"
-hwdb = False
-if sys.argv[1] == 'hwdb':
- hwdb = True
-elif sys.argv[1] != 'udev':
- sys.stderr.write('Unknown mode %s. Must be "hwdb" or "udev".\n' %
sys.argv[1])
- sys.exit(1)
-
# parse MPI files
-for f in sys.argv[2:]:
- parse_mpi(f, hwdb)
+for f in sys.argv[1:]:
+ parse_mpi(f)
# udev rules footer
os.write(sys.stdout.fileno(), b'\nLABEL="media_player_end"\n')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/media-player-info-23/tools/udev-syntax-check.py
new/media-player-info-24/tools/udev-syntax-check.py
--- old/media-player-info-23/tools/udev-syntax-check.py 2013-07-24
15:08:37.000000000 +0200
+++ new/media-player-info-24/tools/udev-syntax-check.py 2018-08-20
23:30:52.000000000 +0200
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU General Public License
# along with keymap; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import re
import sys
