Python3 rpm

.tito/packages/.readme

@@ -0,0 +1,3 @@
+the .tito/packages directory contains metadata files
+named after their packages. Each file has the latest tagged
+version and the project's relative directory.

.tito/packages/pulseaudio-dlna

@@ -0,0 +1 @@
+0.6.6-1 ./

.tito/tito.props

@@ -0,0 +1,5 @@
+[buildconfig]
+builder = tito.builder.Builder
+tagger = tito.tagger.VersionTagger
+changelog_do_not_remove_cherrypick = 0
+changelog_format = %s (%ae)

Makefile

@@ -13,17 +13,19 @@
 # You should have received a copy of the GNU General Public License
 # along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
 
-python ?= python2.7
+python ?= python3
 user ?= $(shell whoami)
 
 all: pulseaudio_dlna.egg-info
 
 venv:
 	@echo "venv is deprecated. It is just 'make' now."
 
-pulseaudio_dlna.egg-info: setup.py bin/pip
-	bin/pip install --editable . && touch $@
-bin/pip:
+
+pulseaudio_dlna.egg-info: setup.py bin/pip3
+	bin/pip3 install --editable . && touch $@
+bin/pip3:
+
 	virtualenv --system-site-packages -p $(python) .
 
 ifdef DEB_HOST_ARCH
@@ -45,11 +47,15 @@ release: manpage
 
 manpage: man/pulseaudio-dlna.1
 
+
 man/pulseaudio-dlna.1: pulseaudio_dlna.egg-info
 	export USE_PKG_VERSION=1; help2man -n "Stream audio to DLNA devices and Chromecasts" "bin/pulseaudio-dlna" > /tmp/pulseaudio-dlna.1
 	mv /tmp/pulseaudio-dlna.1 man/pulseaudio-dlna.1
+	gzip -fk man/pulseaudio-dlna.1
+
 
 clean:
 	rm -rf build dist $(shell find pulseaudio_dlna -name "__pycache__")
 	rm -rf *.egg-info *.egg bin local lib lib64 include share pyvenv.cfg
 	rm -rf docs htmlcov .coverage .tox pip-selfcheck.json
+	rm man/pulseaudio-dlna.1.gz

README.md

@@ -1,4 +1,17 @@
 # About #
+*Cygn:* This fork takes over masmu/python3 with various fixes and patches, with the help of community, with fedora packaging in mind. Other distributions should work too.
+- Avalaible as RPM for Fedora / RH flavours on [COPR](https://copr.fedorainfracloud.org/coprs/cygn/pulseaudio-dlna/)
+
+- *Fedora 34:* You need to switch pipeware back to pulseaudio:
+
+    dnf swap --allowerasing pipewire-pulseaudio pulseaudio
+
+- *Fedora 35:* You need to disable wireplumber:
+
+    systemctl --user mask wireplumber.service
+
+______________________________________________________________
+
 <img align="left" src="samples/images/application.png">
 
 This is _pulseaudio-dlna_. A lightweight streaming server which brings DLNA / UPNP
@@ -35,6 +48,11 @@ UPNP renderers in your network will show up as pulseaudio sinks.
 If I could help you or if you like my work, you can buy me a [coffee, a beer or pizza](https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=totalexceed%40lancode%2ede&item_name=Donation&no_shipping=2&no_note=1&tax=0&currency_code=EUR&bn=PP%2dDonationsBF&charset=UTF%2d8).
 
 ## Changelog ##
+ * __python3__ - (_2020-12-25_)
+
+    - Pulled some outstanding fixes waiting on masmu's repo
+    - mfdgroot fixed compatibility with pychromecast 7.5.1
+    - bumped version to 6.1
 
  * __master__ - (_2017-04-06_)
     - Fixed a bug where the detection of DLNA devices failed when there were multiple network interfaces
@@ -252,23 +270,21 @@ is loaded.
 These are the requirements _pulseaudio-dlna_ acutally needs to run. These dependencies
 will get installed if you install it via the PPA.
 
-- python2.7
-- python-pip
-- python-setuptools
-- python-dbus
-- python-docopt
-- python-requests
-- python-setproctitle
-- python-gi
-- python-protobuf
-- python-notify2
-- python-psutil
-- python-concurrent.futures
-- python-chardet
-- python-netifaces
-- python-pyroute2 | python-netaddr
-- python-lxml
-- python-zeroconf
+- python3
+- python3-pip
+- python3-setuptools
+- python3-dbus
+- python3-docopt
+- python3-requests
+- python3-setproctitle
+- python3-gi
+- python3-notify2
+- python3-psutil
+- python3-chardet
+- python3-netifaces
+- python3-pyroute2 | python3-netaddr
+- python3-lxml
+- python3-pychromecast
 - vorbis-tools
 - sox
 - lame
@@ -278,7 +294,7 @@ will get installed if you install it via the PPA.
 
 You can install all the dependencies in Ubuntu via:
 
-    sudo apt-get install python2.7 python-pip python-setuptools python-dbus python-docopt python-requests python-setproctitle python-gi python-protobuf python-notify2 python-psutil python-concurrent.futures python-chardet python-netifaces python-pyroute2 python-netaddr python-lxml python-zeroconf vorbis-tools sox lame flac faac opus-tools
+    sudo apt-get install python3 python3-pip python3-setuptools python3-dbus python3-docopt python3-requests python3-setproctitle python3-gi python3-notify2 python3-psutil python3-chardet python3-netifaces python3-pyroute2 python3-netaddr python3-lxml python3-pychromecast vorbis-tools sox lame flac faac opus-tools
 
 ### PulseAudio DBus module ###
 
@@ -314,7 +330,7 @@ So all Ubuntu versions prior to _14.10 Utopic_ need to install:
 
 All Ubuntu versions above install:
 
-    sudo apt-get install virtualenv python-dev
+    sudo apt-get install virtualenv python3-dev
 
 #### Installing & starting ####
 

man/pulseaudio-dlna.1

@@ -1,21 +1,22 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.2.
-.TH PULSEAUDIO-DLNA "1" "April 2016" "pulseaudio-dlna 0.5.2" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.14.
+.TH PULSEAUDIO-DLNA "1" "janvier 2021" "pulseaudio-dlna 0.6.1" "User Commands"
 .SH NAME
 pulseaudio-dlna \- Stream audio to DLNA devices and Chromecasts
 .SH DESCRIPTION
 .SS "Usage:"
 .TP
-pulseaudio\-dlna pulseaudio\-dlna [\-\-host <host>] [\-\-port <port>][\-\-encoder <encoders> | \fB\-\-codec\fR <codec>] [\-\-bit\-rate=<rate>]
+pulseaudio\-dlna [\-\-host <host>] [\-\-port <port>][\-\-encoder <encoders> | \fB\-\-codec\fR <codec>] [\-\-bit\-rate=<rate>]
 [\-\-encoder\-backend <encoder\-backend>]
 [\-\-filter\-device=<filter\-device>]
 [\-\-renderer\-urls <urls>]
 [\-\-request\-timeout <timeout>]
+[\-\-chunk\-size <chunk\-size>]
 [\-\-msearch\-port=<msearch\-port>] [\-\-ssdp\-mx <ssdp\-mx>] [\-\-ssdp\-ttl <ssdp\-ttl>] [\-\-ssdp\-amount <ssdp\-amount>]
 [\-\-cover\-mode <mode>]
 [\-\-auto\-reconnect]
 [\-\-debug]
 [\-\-fake\-http10\-content\-length] [\-\-fake\-http\-content\-length]
-[\-\-disable\-switchback] [\-\-disable\-ssdp\-listener] [\-\-disable\-device\-stop] [\-\-disable\-workarounds]
+[\-\-disable\-switchback] [\-\-disable\-ssdp\-listener] [\-\-disable\-device\-stop] [\-\-disable\-workarounds] [\-\-disable\-mimetype\-check]
 .TP
 pulseaudio\-dlna [\-\-host <host>] [\-\-create\-device\-config] [\-\-update\-device\-config]
 [\-\-msearch\-port=<msearch\-port>] [\-\-ssdp\-mx <ssdp\-mx>] [\-\-ssdp\-ttl <ssdp\-ttl>] [\-\-ssdp\-amount <ssdp\-amount>]
@@ -94,6 +95,9 @@ Set the renderer urls yourself. no discovery will commence.
 \fB\-\-request\-timeout=\fR<timeout>
 Set the timeout for requests in seconds [default: 15].
 .TP
+\fB\-\-chunk\-size=\fR<chunk\-size>
+Set the stream's chunk size [default: 4096].
+.TP
 \fB\-\-ssdp\-ttl=\fR<ssdp\-ttl>
 Set the SSDP socket's TTL [default: 10].
 .TP
@@ -143,6 +147,9 @@ If set, the application won't send any stop commands to renderers at all
 \fB\-\-disable\-workarounds\fR
 If set, the application won't apply any device workarounds
 .TP
+\fB\-\-disable\-mimetype\-check\fR
+If set, the application won't check the device's mime type capabilities
+.TP
 \fB\-v\fR \fB\-\-version\fR
 Show the version.
 .TP

pulseaudio-dlna.spec

@@ -0,0 +1,83 @@
+%global srcname pulseaudio_dlna
+
+Name: pulseaudio-dlna
+Version: 0.6.6
+Release: 1
+Source0: %{name}-%{version}.tar.gz
+License: GPLv3
+Group: Development/Libraries
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Prefix: %{_prefix}
+BuildArch: noarch
+Vendor: Massimo Mund <[email protected]>
+Url: https://github.com/cygn/pulseaudio-dlna
+Packager: Sinan H <[email protected]>
+Summary: A small DLNA server which brings DLNA / UPNP support to PulseAudio and Linux.
+
+BuildRequires: 	python3-setuptools
+BuildRequires:	python3-pip
+BuildRequires:  python3-devel
+Requires:       python3-gobject
+Requires:	sox
+Requires:	vorbis-tools
+
+%description
+A small DLNA server which brings DLNA / UPNP support to PulseAudio and Linux.
+
+It can stream your current PulseAudio playback to different UPNP devices (UPNP Media Renderers) in your network. It's main goals are: easy to use, no configuration hassle, no big dependencies.
+
+https://github.com/cygn/pulseaudio-dlna 
+
+%pre
+rm -rf %{python3_sitelib}/%{srcname}*
+
+%prep
+%autosetup -n %{name}-%{version}
+
+%build
+%py3_build
+
+%install
+%py3_install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+# Note that there is no %%files section for the unversioned python module
+%files -n %{name} 
+%doc README.md
+%license LICENSE
+%{python3_sitelib}/%{srcname}-*.egg-info/ 
+%{python3_sitelib}/%{srcname}/
+%{_bindir}/pulseaudio-dlna
+%{_mandir}/man1/%{name}.1*
+
+%changelog
+* Thu Dec 29 2022 Sinan Haliyo <[email protected]> 0.6.6-1
+- fix processing of dict-encapsulated sink mime support response
+  84c60d800a3cc549b5b829b1c599c22fa7b030f1 @stsichler ([email protected])
+
+* Sat Mar 19 2022 Sinan Haliyo <[email protected]> 0.6.5-1
+- requires pychromecast 10 ([email protected])
+
+* Sat Jan 08 2022 Sinan Haliyo <[email protected]> 0.6.4-1
+- pychromecast 10 compatiblity ([email protected])
+- pychromecast 10 compatible now ([email protected])
+
+* Thu Jan 06 2022 cygn <[email protected]> 0.6.3-6
+- 
+
+* Mon Dec 27 2021 Sinan Haliyo <[email protected]> 0.6.3-5
+- 
+
+* Mon Dec 27 2021 Sinan Haliyo <[email protected]> 0.6.3-4
+- new release ([email protected])
+
+* Mon Dec 27 2021 Sinan Haliyo <[email protected]> 0.6.3-3
+- new package built with tito
+
+* Mon Dec 27 2021 Sinan Haliyo <[email protected]>
+- new package built with tito
+
+
+

pulseaudio_dlna/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # This file is part of pulseaudio-dlna.
 
@@ -15,12 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
-
 import os
 import pkg_resources
 
-import utils.git
+from .utils import git
 
 try:
     version = pkg_resources.get_distribution(__package__).version
@@ -30,7 +28,7 @@
 if os.environ.get('USE_PKG_VERSION', None) == '1':
     branch, rev = None, None
 else:
-    branch, rev = utils.git.get_head_version()
+    branch, rev = git.get_head_version()
 
 __version__ = '{version}{rev}'.format(
     version=version,

pulseaudio_dlna/__main__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # This file is part of pulseaudio-dlna.
 
@@ -115,9 +115,6 @@
 
 '''
 
-
-from __future__ import unicode_literals
-
 import sys
 import os
 import docopt
@@ -170,5 +167,6 @@ def acquire_lock():
     except socket.error:
         return False
 
+
 if __name__ == "__main__":
     sys.exit(main())

pulseaudio_dlna/application.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # This file is part of pulseaudio-dlna.
 
@@ -15,8 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
-
 import multiprocessing
 import signal
 import setproctitle
@@ -33,7 +31,6 @@
 import pulseaudio_dlna.plugins.dlna.ssdp.listener
 import pulseaudio_dlna.plugins.dlna.ssdp.discover
 import pulseaudio_dlna.plugins.chromecast
-import pulseaudio_dlna.plugins.chromecast.mdns
 import pulseaudio_dlna.encoders
 import pulseaudio_dlna.covermodes
 import pulseaudio_dlna.streamserver
@@ -47,7 +44,6 @@
 
 class Application(object):
 
-    ENCODING = 'utf-8'
     DEVICE_CONFIG_PATHS = [
         os.path.expanduser('~/.local/share/pulseaudio-dlna'),
         '/etc/pulseaudio-dlna',
@@ -213,7 +209,7 @@ def run(self, options):
             logger.info('  {}'.format(encoder))
 
         logger.info('Codec settings:')
-        for identifier, _type in pulseaudio_dlna.codecs.CODECS.iteritems():
+        for identifier, _type in pulseaudio_dlna.codecs.CODECS.items():
             codec = _type()
             logger.info('  {}'.format(codec))
 
@@ -331,9 +327,9 @@ def obj_to_dict(obj):
                     continue
             try:
                 with open(config_file, 'w') as h:
-                    h.write(json_text.encode(self.ENCODING))
+                    h.write(json_text)
                     logger.info('Found the following devices:')
-                    for device in holder.devices.values():
+                    for device in list(holder.devices.values()):
                         logger.info('{name} ({flavour})'.format(
                             name=device.name, flavour=device.flavour))
                         for codec in device.codecs:
@@ -356,7 +352,7 @@ def read_device_config(self):
             if os.path.isfile(config_file) and \
                os.access(config_file, os.R_OK):
                 with open(config_file, 'r') as h:
-                    json_text = h.read().decode(self.ENCODING)
+                    json_text = h.read()
                     logger.debug('Device configuration:\n{}'.format(json_text))
                     json_text = json_text.replace('\n', '')
                     try: