jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #50354 from pbogdan/miro-remove

Browse Source 
miro: remove
This commit is contained in:
Jörg Thalheim 2018-11-14 17:09:10 +00:00 committed by GitHub
commit 4c3e9a7d06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
pkgs/applications/video/miro/default.nix
View File

@ -1,90 +0,0 @@
{ stdenv, fetchurl, pkgconfig
, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk24x-gtk2, libsoup
, taglib, sqlite
, libtorrentRasterbar, glib-networking, gsettings-desktop-schemas
, gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg
, enableBonjour ? false, avahi ? null
}:
assert enableBonjour -> avahi != null;
with stdenv.lib;
let
inherit (pythonPackages) python buildPythonApplication;
version = "6.0";
in buildPythonApplication rec {
name = "miro-${version}";
src = fetchurl {
url = "http://ftp.osuosl.org/pub/pculture.org/miro/src/${name}.tar.gz";
sha256 = "0sq25w365i1fz95398vxql3yjl5i6mq77mnmlhmn0pgyg111k3am";
};
setSourceRoot = ''
sourceRoot=${name}/linux
'';
patches = [ ./gconf.patch ];
postPatch = ''
patch -p1 -d .. < "${./youtube-feeds.patch}"
sed -i -e 's/\$(shell which python)/python/' Makefile
sed -i -e 's|/usr/bin/||' -e 's|/usr||' \
-e 's/BUILD_TIME[^,]*/BUILD_TIME=0/' setup.py
sed -i -e 's|default="/usr/bin/ffmpeg"|default="${ffmpeg.bin}/bin/ffmpeg"|' \
plat/options.py
sed -i -e 's|/usr/share/miro/themes|'"$out/share/miro/themes"'|' \
-e 's/gnome-open/xdg-open/g' \
-e '/RESOURCE_ROOT =.*(/,/)/ {
c RESOURCE_ROOT = '"'$out/share/miro/resources/'"'
}' \
plat/resources.py
'' + optionalString enableBonjour ''
sed -i -e 's|ctypes.cdll.LoadLibrary( *|ctypes.CDLL("${avahi}/lib/" +|' \
../lib/libdaap/pybonjour.py
'';
# Disabled for now, because it requires networking and even if we skip those
# tests, the whole test run takes around 10-20 minutes.
doCheck = false;
checkPhase = ''
HOME="$TEMPDIR" LANG=en_US.UTF-8 python miro.real --unittest
'';
preInstall = ''
# see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
${python.interpreter} setup.py install_data --root=$out
sed -i '/data_files=data_files/d' setup.py
'';
postInstall = ''
mv "$out/bin/miro.real" "$out/bin/miro"
wrapProgram "$out/bin/miro" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
'';
buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [
pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk24x-gtk2 libsoup
taglib gsettings-desktop-schemas sqlite
];
propagatedBuildInputs = with pythonPackages; [
pygobject2 pygtk pycurl mutagen pycairo dbus-python
pywebkitgtk] ++ [ libtorrentRasterbar
gst-python gst-plugins-base gst-plugins-good gst-ffmpeg
] ++ optional enableBonjour avahi;
meta = {
homepage = http://www.getmiro.com/;
description = "Video and audio feed aggregator";
license = licenses.gpl2Plus;
maintainers = [ maintainers.aszlig ];
platforms = platforms.linux;
};
}

374
pkgs/applications/video/miro/gconf.patch
View File

@ -1,374 +0,0 @@
diff --git a/plat/associate.py b/plat/associate.py
index 0f3cd31..f9b5a76 100644
--- a/plat/associate.py
+++ b/plat/associate.py
@@ -31,69 +31,8 @@
Holds functions that associate Miro with certain protocols
"""
-import gconf
-from miro.plat.config import gconf_lock
-
def associate_protocols(command):
- _associate_protocol("magnet", command, False)
+ pass
def disassociate_protocols(command):
- _disassociate_protocol("magnet", command)
-
-def _associate_protocol(name, command, overwrite_existing=False):
- url_handlers_key = "/desktop/gnome/url-handlers/" + name + "/"
- if not _is_associated(name) or overwrite_existing:
- gconf_lock.acquire()
- try:
- gconf_client = gconf.client_get_default()
- if gconf_client.set_string(url_handlers_key + "command", command):
- gconf_client.set_bool(url_handlers_key + "needs_terminal", False)
- gconf_client.set_bool(url_handlers_key + "enabled", True)
- success = True
- else:
- success = False
- finally:
- gconf_lock.release()
- else:
- success = True
- return success
-
-def _disassociate_protocol(name, command):
- url_handlers_key = "/desktop/gnome/url-handlers/" + name + "/"
- if _is_associated(name, command):
- gconf_lock.acquire()
- try:
- gconf_client = gconf.client_get_default()
- if gconf_client.set_bool(url_handlers_key + "enabled", False):
- success = True
- else:
- success = False
- finally:
- gconf_lock.release()
- else:
- success = True
- return success
-
-def _is_associated(protocol, command=None):
- """ Checks whether a protocol currently is
- associated with the given command, or,
- if none is given, whether the protocol
- is associated with anything at all.
- """
- url_handlers_key = "/desktop/gnome/url-handlers/" + protocol + "/"
- gconf_lock.acquire()
- try:
- gconf_client = gconf.client_get_default()
- key = gconf_client.get(url_handlers_key + "command")
- if key is None:
- associated = False
- else:
- enabled = gconf_client.get(url_handlers_key + "enabled")
- if command:
- associated = key.get_string() == command and enabled.get_bool()
- else:
- associated = key.get_string() != "" and enabled.get_bool()
- finally:
- gconf_lock.release()
- return associated
-
+ pass
diff --git a/plat/config.py b/plat/config.py
index 40895af..24f8815 100644
--- a/plat/config.py
+++ b/plat/config.py
@@ -39,51 +39,20 @@ Preferences are listed in miro.pref and also miro.plat.options.
import os
import logging
from miro import prefs
-import gconf
+import shelve
import threading
from miro.plat import options
from miro.plat import resources
-client = gconf.client_get_default()
-gconf_lock = threading.RLock()
-
-
-def gconf_key(key):
- if options.gconf_name is None:
- options.gconf_name = "miro"
- return '/apps/%s/%s' % (options.gconf_name, key)
-
-
-def _convert_gconf_value(value):
- if value.type == gconf.VALUE_STRING:
- return value.get_string()
- if value.type == gconf.VALUE_INT:
- return value.get_int()
- if value.type == gconf.VALUE_BOOL:
- return value.get_bool()
- if value.type == gconf.VALUE_FLOAT:
- return value.get_float()
- if value.type == gconf.VALUE_LIST:
- return [_convert_gconf_value(v) for v in value.get_list()]
- raise TypeError("unknown gconf type %s" % value.type)
-
-
-def _get_gconf(fullkey, default=None):
- gconf_lock.acquire()
- try:
- value = client.get(fullkey)
- if value != None:
- try:
- return _convert_gconf_value(value)
- except TypeError, e:
- logging.warn("type error while getting gconf value %s: %s",
- fullkey, str(e))
- return default
- finally:
- gconf_lock.release()
-
-
-class GconfDict:
+
+class ConfigFile(object):
+ def __init__(self):
+ support_dir = get(prefs.SUPPORT_DIRECTORY)
+ if not os.path.exists(support_dir):
+ os.makedirs(support_dir)
+ path = os.path.join(support_dir, 'config')
+ self.conf = shelve.open(path, 'c', -1, True)
+
def get(self, key, default=None):
if not isinstance(key, str):
raise TypeError()
@@ -91,19 +56,16 @@ class GconfDict:
if "MIRO_%s" % key.upper() in os.environ:
return os.environ["MIRO_%s" % key.upper()]
- fullkey = gconf_key(key)
- return _get_gconf(fullkey, default)
+ return self.conf.get(key, default)
+
+ def __del__(self):
+ self.conf.close()
def __contains__(self, key):
if "MIRO_%s" % key.upper() in os.environ:
return True
- gconf_lock.acquire()
- try:
- fullkey = gconf_key(key)
- return client.get(fullkey) is not None
- finally:
- gconf_lock.release()
+ return key in self.conf
def __getitem__(self, key):
rv = self.get(key)
@@ -116,43 +78,11 @@ class GconfDict:
if "MIRO_%s" % key.upper() in os.environ:
return
- gconf_lock.acquire()
- try:
- if not isinstance(key, str):
- raise TypeError()
-
- fullkey = gconf_key(key)
- if isinstance(value, str):
- client.set_string(fullkey, value)
- elif isinstance(value, bool):
- client.set_bool(fullkey, value)
- elif isinstance(value, int):
- client.set_int(fullkey, value)
- elif isinstance(value, float):
- client.set_float(fullkey, value)
- elif isinstance(value, list):
- # this is lame, but there isn't enough information to
- # figure it out another way
- if len(value) == 0 or isinstance(value[0], str):
- list_type = gconf.VALUE_STRING
- elif isinstance(value[0], int):
- list_type = gconf.VALUE_INT
- elif isinstance(value[0], float):
- list_type = gconf.VALUE_FLOAT
- elif isinstance(value[0], bool):
- list_type = gconf.VALUE_BOOL
- else:
- raise TypeError("unknown gconf type %s" % type(value[0]))
-
- client.set_list(fullkey, list_type, value)
- else:
- raise TypeError()
- finally:
- gconf_lock.release()
+ self.conf[key] = value
def load():
- return GconfDict()
+ return ConfigFile()
def save(data):
@@ -208,25 +138,4 @@ def get(descriptor):
value = get(prefs.SUPPORT_DIRECTORY)
value = os.path.join(value, 'miro-helper.log')
- elif descriptor == prefs.HTTP_PROXY_ACTIVE:
- return _get_gconf("/system/http_proxy/use_http_proxy")
-
- elif descriptor == prefs.HTTP_PROXY_HOST:
- return _get_gconf("/system/http_proxy/host")
-
- elif descriptor == prefs.HTTP_PROXY_PORT:
- return _get_gconf("/system/http_proxy/port")
-
- elif descriptor == prefs.HTTP_PROXY_AUTHORIZATION_ACTIVE:
- return _get_gconf("/system/http_proxy/use_authentication")
-
- elif descriptor == prefs.HTTP_PROXY_AUTHORIZATION_USERNAME:
- return _get_gconf("/system/http_proxy/authentication_user")
-
- elif descriptor == prefs.HTTP_PROXY_AUTHORIZATION_PASSWORD:
- return _get_gconf("/system/http_proxy/authentication_password")
-
- elif descriptor == prefs.HTTP_PROXY_IGNORE_HOSTS:
- return _get_gconf("/system/http_proxy/ignore_hosts", [])
-
return value
diff --git a/plat/frontends/widgets/application.py b/plat/frontends/widgets/application.py
index a1eaaf3..20f4c23 100644
--- a/plat/frontends/widgets/application.py
+++ b/plat/frontends/widgets/application.py
@@ -35,7 +35,6 @@ except RuntimeError:
sys.exit(1)
import gobject
import os
-import gconf
import shutil
import platform
@@ -53,7 +52,6 @@ from miro import prefs
from miro.frontends.widgets.application import Application
# from miro.plat.frontends.widgets import threads
from miro.plat import renderers, options
-from miro.plat.config import gconf_lock, gconf_key
try:
from miro.plat.frontends.widgets import miroappindicator
APP_INDICATOR_SUPPORT = True
@@ -77,29 +75,13 @@ import sys
def _get_pref(key, getter_name):
- gconf_lock.acquire()
- try:
- client = gconf.client_get_default()
- fullkey = gconf_key(key)
- value = client.get(fullkey)
- if value is not None:
- getter = getattr(value, getter_name)
- return getter()
- else:
- return None
- finally:
- gconf_lock.release()
+ # XXX: ugly!
+ return app.config._data.get(key)
def _set_pref(key, setter_name, value):
- gconf_lock.acquire()
- try:
- client = gconf.client_get_default()
- fullkey = gconf_key(key)
- setter = getattr(client, setter_name)
- setter(fullkey, value)
- finally:
- gconf_lock.release()
+ # XXX: ugly!
+ app.config._data[key] = value
def get_int(key):
diff --git a/plat/options.py b/plat/options.py
index 4ea1a67..8e75e20 100644
--- a/plat/options.py
+++ b/plat/options.py
@@ -69,14 +69,14 @@ USE_RENDERER = LinuxPref(
GSTREAMER_IMAGESINK = LinuxPref(
key="DefaultGstreamerImagesink",
- default="gconfvideosink",
+ default="autovideosink",
alias="gstreamer-imagesink",
helptext=("Which GStreamer image sink to use for video. "
"(autovideosink, ximagesink, xvimagesink, gconfvideosink, ...)"))
GSTREAMER_AUDIOSINK = LinuxPref(
key="DefaultGstreamerAudiosink",
- default="gconfaudiosink",
+ default="autoaudiosink",
alias="gstreamer-audiosink",
helptext=("Which GStreamer sink to use for audio. "
"(autoaudiosink, osssink, alsasink, gconfaudiosink, ...)"))
diff --git a/plat/upgrade.py b/plat/upgrade.py
index 9677e3a..f812ad4 100644
--- a/plat/upgrade.py
+++ b/plat/upgrade.py
@@ -30,7 +30,6 @@
import os
import shutil
from miro.plat import resources
-import gconf
def upgrade():
@@ -64,47 +63,3 @@ def upgrade():
os.remove(old_file)
except OSError:
pass
-
- # gconf settings
- client = gconf.client_get_default()
-
- def _copy_gconf(src, dst):
- for entry in client.all_entries(src):
- entry_dst = dst + '/' + entry.key.split('/')[-1]
- client.set(entry_dst, entry.value)
- for subdir in client.all_dirs(src):
- subdir_dst = dst + '/' + subdir.split('/')[-1]
- _copy_gconf(subdir, subdir_dst)
-
- if ((client.dir_exists("/apps/democracy/player")
- and not client.dir_exists("/apps/miro"))):
- _copy_gconf("/apps/democracy/player", "/apps/miro")
- client.recursive_unset("/apps/democracy", 1)
-
- # Set the MoviesDirectory and NonVideoDirectory based on the
- # possibilities that we've had over the years and what exists on
- # the user's system. This codifies it in the user's gconf so that
- # when we change it in future, then the user isn't affected.
- from miro.plat import options
- if options.gconf_name is None:
- options.gconf_name = "miro"
- key = "/apps/%s/MoviesDirectory" % options.gconf_name
- if client.get(key) is None:
- for mem in ["~/.miro/Movies", # packages
- "~/Videos/Miro",
- "~/Movies/Miro", # pre 3.5
- "~/Movies/Democracy" # democracy player
- ]:
- mem = os.path.expanduser(mem)
- if os.path.exists(mem):
- client.set_string(key, mem)
- break
-
- key = "/apps/%s/NonVideoDirectory" % options.gconf_name
- if client.get(key) is None:
- for mem in ["~/.miro/Nonvideo" # packages
- ]:
- mem = os.path.expanduser(mem)
- if os.path.exists(mem):
- client.set_string(key, mem)
- break

15
pkgs/applications/video/miro/youtube-feeds.patch
View File

@ -1,15 +0,0 @@
diff --git a/lib/flashscraper.py b/lib/flashscraper.py
index 323dbe4..d203b78 100644
--- a/lib/flashscraper.py
+++ b/lib/flashscraper.py
@@ -134,9 +134,7 @@ def _youtube_callback_step2(info, video_id, callback):
# strip url= from url=xxxxxx, strip trailer. Strip duplicate params.
for fmt, stream_map_data in zip(fmt_list, stream_map):
stream_map = cgi.parse_qs(stream_map_data)
- url_base = stream_map['url'][0]
- sig_part = '&signature=' + stream_map['sig'][0]
- fmt_url_map[fmt] = url_base + sig_part
+ fmt_url_map[fmt] = stream_map['url'][0]
title = params.get("title", ["No title"])[0]
try:

7
pkgs/top-level/all-packages.nix
View File

@ -11456,13 +11456,6 @@ with pkgs;
minizip = callPackage ../development/libraries/minizip { };
miro = callPackage ../applications/video/miro {
avahi = avahi.override {
withLibdnssdCompat = true;
};
ffmpeg = ffmpeg_2;
};
mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { };
mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix {