summaryrefslogtreecommitdiff
path: root/nonprism
diff options
context:
space:
mode:
Diffstat (limited to 'nonprism')
-rw-r--r--nonprism/grilo-plugins/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch27
-rw-r--r--nonprism/grilo-plugins/0001-meson-Fix-library-name-of-optical-media-plugin.patch25
-rw-r--r--nonprism/grilo-plugins/0002-lua-factory-Remove-generated-htmlentity.c.patch923
-rw-r--r--nonprism/grilo-plugins/PKGBUILD42
4 files changed, 1000 insertions, 17 deletions
diff --git a/nonprism/grilo-plugins/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch b/nonprism/grilo-plugins/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch
new file mode 100644
index 000000000..6f37c5474
--- /dev/null
+++ b/nonprism/grilo-plugins/0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch
@@ -0,0 +1,27 @@
+From 2fc539daa0e51a280f36c3d3558f15856bc217fd Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Fri, 17 Feb 2017 23:22:59 +0100
+Subject: [PATCH 1/2] lua-factory: Remove bad prototype for html_entity_hash
+
+gperf 3.1 changes the type of the len argument for the generated
+function to size_t, causing a conflict.
+---
+ src/lua-factory/lua-library/htmlentity.gperf | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/lua-factory/lua-library/htmlentity.gperf b/src/lua-factory/lua-library/htmlentity.gperf
+index cbd326c4f56f3e2d..096bf3e39b106eda 100644
+--- a/src/lua-factory/lua-library/htmlentity.gperf
++++ b/src/lua-factory/lua-library/htmlentity.gperf
+@@ -35,8 +35,6 @@ struct _EntityEntry {
+ const gchar *name;
+ gulong value;
+ };
+-struct _EntityEntry *
+-html_entity_hash (register const char *str, register unsigned int len);
+ %%
+ Aacute, 193
+ aacute, 225
+--
+2.11.1
+
diff --git a/nonprism/grilo-plugins/0001-meson-Fix-library-name-of-optical-media-plugin.patch b/nonprism/grilo-plugins/0001-meson-Fix-library-name-of-optical-media-plugin.patch
new file mode 100644
index 000000000..99b516b6e
--- /dev/null
+++ b/nonprism/grilo-plugins/0001-meson-Fix-library-name-of-optical-media-plugin.patch
@@ -0,0 +1,25 @@
+From 1282d9e3756d38362a5dc34c41ba0dd6c5c3ff71 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Fri, 17 Feb 2017 23:38:48 +0100
+Subject: [PATCH] meson: Fix library name of optical-media plugin
+
+---
+ src/optical-media/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/optical-media/meson.build b/src/optical-media/meson.build
+index aaf6a68786853aec..5a8845e4aecf37bb 100644
+--- a/src/optical-media/meson.build
++++ b/src/optical-media/meson.build
+@@ -13,7 +13,7 @@ optical_media_sources = [
+ configure_file(output: 'config.h',
+ configuration: cdata)
+
+-shared_library('grlopticalmedia',
++shared_library('grloptical-media',
+ sources: optical_media_sources,
+ install: true,
+ install_dir: pluginsdir,
+--
+2.11.1
+
diff --git a/nonprism/grilo-plugins/0002-lua-factory-Remove-generated-htmlentity.c.patch b/nonprism/grilo-plugins/0002-lua-factory-Remove-generated-htmlentity.c.patch
new file mode 100644
index 000000000..74bd7c84e
--- /dev/null
+++ b/nonprism/grilo-plugins/0002-lua-factory-Remove-generated-htmlentity.c.patch
@@ -0,0 +1,923 @@
+From 6e5af8909cfa0f93a70c4ed8e6051bcdbdf29cfa Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Fri, 17 Feb 2017 23:26:38 +0100
+Subject: [PATCH 2/2] lua-factory: Remove generated htmlentity.c
+
+Now that gperf is required to build this plugin, the generated
+htmlentity.c should be removed from the source. Otherwise, it
+will be used iff builddir == srcdir.
+---
+ src/lua-factory/Makefile.am | 8 +-
+ src/lua-factory/lua-library/htmlentity.c | 876 -------------------------------
+ 2 files changed, 5 insertions(+), 879 deletions(-)
+ delete mode 100644 src/lua-factory/lua-library/htmlentity.c
+
+diff --git a/src/lua-factory/Makefile.am b/src/lua-factory/Makefile.am
+index 5a57f0e292ca2d05..70747329c7ea0685 100644
+--- a/src/lua-factory/Makefile.am
++++ b/src/lua-factory/Makefile.am
+@@ -33,14 +33,16 @@ libgrlluafactory_la_SOURCES = \
+ grl-lua-library-operations.c \
+ grl-lua-library-operations.h \
+ grl-lua-common.h \
+- luafactoryresources.c \
+- luafactoryresources.h \
+- lua-library/htmlentity.c \
+ lua-library/htmlentity.h \
+ lua-library/lua-json.c \
+ lua-library/lua-xml.c \
+ lua-library/lua-libraries.h
+
++nodist_libgrlluafactory_la_SOURCES = \
++ luafactoryresources.c \
++ luafactoryresources.h \
++ lua-library/htmlentity.c
++
+ extdir = $(GRL_PLUGINS_DIR)
+
+ lua_factory_resources_files = \
+diff --git a/src/lua-factory/lua-library/htmlentity.c b/src/lua-factory/lua-library/htmlentity.c
+deleted file mode 100644
+index adca6c4d54460d76..0000000000000000
+--- a/src/lua-factory/lua-library/htmlentity.c
++++ /dev/null
+@@ -1,876 +0,0 @@
+-/* ANSI-C code produced by gperf version 3.0.4 */
+-/* Command-line: gperf --struct-type -l -N html_entity_hash -L ANSI-C htmlentity.gperf */
+-/* Computed positions: -k'1-3,5,$' */
+-
+-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+- && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+-/* The character set is not based on ISO-646. */
+-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+-#endif
+-
+-#line 1 "htmlentity.gperf"
+-
+-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+-/* htmlentity.c
+- *
+- * This file is part of the GtkHTML library.
+- *
+- * Copyright (C) 1999 Helix Code, Inc.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 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
+- * Library General Public License for more details.
+- *
+- * You should have received a copy of the GNU Library General Public License
+- * along with this library; see the file COPYING.LIB. If not, write to
+- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+- * Boston, MA 02110-1301, USA.
+- *
+- * Author: Ettore Perazzoli
+- */
+-
+-#include <config.h>
+-#include <string.h>
+-#include <stdlib.h>
+-
+-#include <glib.h>
+-#include "htmlentity.h"
+-
+-#line 34 "htmlentity.gperf"
+-struct _EntityEntry {
+- const gchar *name;
+- gulong value;
+-};
+-struct _EntityEntry *
+-html_entity_hash (register const char *str, register unsigned int len);
+-
+-#define TOTAL_KEYWORDS 253
+-#define MIN_WORD_LENGTH 2
+-#define MAX_WORD_LENGTH 8
+-#define MIN_HASH_VALUE 8
+-#define MAX_HASH_VALUE 738
+-/* maximum key range = 731, duplicates = 0 */
+-
+-#ifdef __GNUC__
+-__inline
+-#else
+-#ifdef __cplusplus
+-inline
+-#endif
+-#endif
+-static unsigned int
+-hash (register const char *str, register unsigned int len)
+-{
+- static unsigned short asso_values[] =
+- {
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 10,
+- 35, 20, 0, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 175, 135, 30, 60, 95,
+- 5, 0, 5, 180, 739, 15, 5, 0, 15, 110,
+- 110, 739, 5, 5, 5, 100, 739, 739, 0, 20,
+- 0, 739, 739, 739, 739, 739, 739, 5, 60, 50,
+- 0, 15, 144, 115, 215, 10, 225, 10, 95, 125,
+- 25, 0, 5, 218, 90, 20, 0, 65, 35, 55,
+- 45, 115, 5, 15, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
+- 739, 739, 739, 739, 739, 739, 739
+- };
+- register int hval = len;
+-
+- switch (hval)
+- {
+- default:
+- hval += asso_values[(unsigned char)str[4]];
+- /*FALLTHROUGH*/
+- case 4:
+- case 3:
+- hval += asso_values[(unsigned char)str[2]];
+- /*FALLTHROUGH*/
+- case 2:
+- hval += asso_values[(unsigned char)str[1]+1];
+- /*FALLTHROUGH*/
+- case 1:
+- hval += asso_values[(unsigned char)str[0]];
+- break;
+- }
+- return hval + asso_values[(unsigned char)str[len - 1]];
+-}
+-
+-#ifdef __GNUC__
+-__inline
+-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+-__attribute__ ((__gnu_inline__))
+-#endif
+-#endif
+-struct _EntityEntry *
+-html_entity_hash (register const char *str, register unsigned int len)
+-{
+- static unsigned char lengthtable[] =
+- {
+- 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3,
+- 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 4, 0, 0, 0,
+- 3, 4, 0, 0, 0, 3, 4, 0, 0, 0, 3, 4, 5, 6,
+- 0, 3, 4, 5, 6, 0, 0, 4, 0, 6, 0, 0, 0, 5,
+- 6, 0, 0, 0, 5, 0, 0, 3, 0, 5, 0, 0, 3, 4,
+- 5, 0, 0, 0, 4, 5, 0, 0, 0, 4, 5, 0, 0, 3,
+- 4, 5, 0, 0, 0, 0, 5, 0, 0, 3, 0, 5, 6, 0,
+- 3, 4, 0, 6, 2, 3, 4, 5, 0, 0, 0, 0, 0, 6,
+- 2, 3, 0, 5, 6, 2, 0, 0, 5, 6, 0, 3, 0, 5,
+- 0, 2, 0, 0, 5, 6, 0, 3, 4, 5, 6, 0, 0, 0,
+- 0, 6, 0, 3, 4, 5, 6, 0, 0, 4, 5, 6, 0, 4,
+- 4, 0, 6, 7, 4, 4, 5, 0, 2, 8, 4, 5, 6, 0,
+- 4, 0, 5, 6, 0, 3, 0, 5, 6, 0, 3, 4, 5, 6,
+- 2, 0, 0, 6, 2, 0, 0, 0, 0, 6, 0, 3, 4, 6,
+- 6, 0, 3, 4, 5, 6, 0, 0, 0, 0, 6, 0, 3, 5,
+- 5, 0, 0, 4, 0, 5, 6, 0, 4, 0, 6, 6, 0, 4,
+- 0, 5, 6, 2, 0, 0, 0, 6, 0, 0, 0, 0, 0, 2,
+- 3, 0, 0, 6, 2, 0, 4, 5, 6, 4, 4, 0, 0, 0,
+- 0, 0, 5, 5, 2, 4, 0, 4, 5, 0, 2, 3, 4, 0,
+- 0, 7, 0, 4, 5, 6, 0, 0, 4, 5, 2, 0, 0, 4,
+- 5, 6, 2, 3, 6, 5, 6, 0, 4, 4, 5, 6, 4, 5,
+- 4, 5, 0, 7, 5, 4, 5, 0, 0, 3, 4, 5, 6, 0,
+- 3, 4, 6, 6, 3, 5, 5, 5, 0, 0, 5, 4, 5, 0,
+- 0, 0, 4, 0, 0, 0, 5, 4, 5, 0, 0, 5, 4, 0,
+- 6, 0, 4, 4, 0, 0, 0, 0, 0, 0, 6, 2, 0, 0,
+- 6, 6, 0, 0, 4, 5, 6, 0, 5, 4, 5, 6, 0, 0,
+- 5, 5, 6, 0, 3, 4, 0, 6, 0, 5, 4, 5, 6, 3,
+- 5, 0, 7, 0, 0, 0, 4, 0, 0, 0, 0, 5, 6, 0,
+- 0, 0, 5, 5, 6, 0, 0, 0, 0, 6, 0, 0, 0, 5,
+- 0, 0, 0, 4, 0, 0, 0, 0, 4, 0, 0, 0, 0, 4,
+- 5, 0, 0, 0, 0, 0, 6, 0, 0, 0, 7, 0, 0, 0,
+- 4, 6, 0, 0, 0, 4, 5, 0, 0, 0, 0, 5, 6, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 4, 7, 6,
+- 0, 0, 0, 7, 0, 3, 3, 0, 0, 6, 0, 0, 5, 6,
+- 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3,
+- 0, 0, 0, 0, 0, 0, 5, 0, 0, 3, 0, 6, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 4, 0, 6, 0, 0, 0, 0, 6, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5
+- };
+- static struct _EntityEntry wordlist[] =
+- {
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 54 "htmlentity.gperf"
+- {"and", 8743},
+- {""}, {""}, {""}, {""},
+-#line 135 "htmlentity.gperf"
+- {"int", 8747},
+- {""}, {""}, {""}, {""},
+-#line 231 "htmlentity.gperf"
+- {"Rho", 929},
+- {""}, {""}, {""}, {""}, {""},
+-#line 137 "htmlentity.gperf"
+- {"iota", 953},
+- {""}, {""}, {""},
+-#line 219 "htmlentity.gperf"
+- {"psi", 968},
+-#line 216 "htmlentity.gperf"
+- {"prod", 8719},
+- {""}, {""}, {""},
+-#line 172 "htmlentity.gperf"
+- {"not", 172},
+-#line 217 "htmlentity.gperf"
+- {"prop", 8733},
+- {""}, {""}, {""},
+-#line 208 "htmlentity.gperf"
+- {"phi", 966},
+-#line 239 "htmlentity.gperf"
+- {"sdot", 8901},
+-#line 260 "htmlentity.gperf"
+- {"theta", 952},
+-#line 237 "htmlentity.gperf"
+- {"Scaron", 352},
+- {""},
+-#line 53 "htmlentity.gperf"
+- {"amp", 38},
+-#line 100 "htmlentity.gperf"
+- {"ensp", 8194},
+-#line 259 "htmlentity.gperf"
+- {"Theta", 920},
+-#line 258 "htmlentity.gperf"
+- {"there4", 8756},
+- {""}, {""},
+-#line 139 "htmlentity.gperf"
+- {"isin", 8712},
+- {""},
+-#line 262 "htmlentity.gperf"
+- {"thinsp", 8201},
+- {""}, {""}, {""},
+-#line 189 "htmlentity.gperf"
+- {"omega", 969},
+-#line 238 "htmlentity.gperf"
+- {"scaron", 353},
+- {""}, {""}, {""},
+-#line 267 "htmlentity.gperf"
+- {"trade", 8482},
+- {""}, {""},
+-#line 74 "htmlentity.gperf"
+- {"Chi", 935},
+- {""},
+-#line 264 "htmlentity.gperf"
+- {"thorn", 254},
+- {""}, {""},
+-#line 253 "htmlentity.gperf"
+- {"sup", 8835},
+-#line 99 "htmlentity.gperf"
+- {"emsp", 8195},
+-#line 214 "htmlentity.gperf"
+- {"prime", 8242},
+- {""}, {""}, {""},
+-#line 250 "htmlentity.gperf"
+- {"sup1", 185},
+-#line 133 "htmlentity.gperf"
+- {"image", 8465},
+- {""}, {""}, {""},
+-#line 254 "htmlentity.gperf"
+- {"supe", 8839},
+-#line 213 "htmlentity.gperf"
+- {"pound", 163},
+- {""}, {""},
+-#line 75 "htmlentity.gperf"
+- {"chi", 967},
+-#line 252 "htmlentity.gperf"
+- {"sup3", 179},
+-#line 173 "htmlentity.gperf"
+- {"notin", 8713},
+- {""}, {""}, {""}, {""},
+-#line 143 "htmlentity.gperf"
+- {"kappa", 954},
+- {""}, {""},
+-#line 105 "htmlentity.gperf"
+- {"eta", 951},
+- {""},
+-#line 142 "htmlentity.gperf"
+- {"Kappa", 922},
+-#line 199 "htmlentity.gperf"
+- {"otilde", 245},
+- {""},
+-#line 81 "htmlentity.gperf"
+- {"cup", 8746},
+-#line 251 "htmlentity.gperf"
+- {"sup2", 178},
+- {""},
+-#line 61 "htmlentity.gperf"
+- {"atilde", 227},
+-#line 165 "htmlentity.gperf"
+- {"Mu", 924},
+-#line 232 "htmlentity.gperf"
+- {"rho", 961},
+-#line 168 "htmlentity.gperf"
+- {"nbsp", 160},
+-#line 45 "htmlentity.gperf"
+- {"acute", 180},
+- {""}, {""}, {""}, {""}, {""},
+-#line 175 "htmlentity.gperf"
+- {"Ntilde", 209},
+-#line 193 "htmlentity.gperf"
+- {"or", 8744},
+-#line 155 "htmlentity.gperf"
+- {"loz", 9674},
+- {""},
+-#line 182 "htmlentity.gperf"
+- {"ocirc", 244},
+-#line 200 "htmlentity.gperf"
+- {"otimes", 8855},
+-#line 177 "htmlentity.gperf"
+- {"Nu", 925},
+- {""}, {""},
+-#line 44 "htmlentity.gperf"
+- {"acirc", 226},
+-#line 176 "htmlentity.gperf"
+- {"ntilde", 241},
+- {""},
+-#line 69 "htmlentity.gperf"
+- {"cap", 8745},
+- {""},
+-#line 129 "htmlentity.gperf"
+- {"icirc", 238},
+- {""},
+-#line 178 "htmlentity.gperf"
+- {"nu", 957},
+- {""}, {""},
+-#line 95 "htmlentity.gperf"
+- {"ecirc", 234},
+-#line 180 "htmlentity.gperf"
+- {"oacute", 243},
+- {""},
+-#line 218 "htmlentity.gperf"
+- {"Psi", 936},
+-#line 248 "htmlentity.gperf"
+- {"sube", 8838},
+-#line 59 "htmlentity.gperf"
+- {"asymp", 8776},
+-#line 42 "htmlentity.gperf"
+- {"aacute", 225},
+- {""}, {""}, {""}, {""},
+-#line 127 "htmlentity.gperf"
+- {"iacute", 237},
+- {""},
+-#line 207 "htmlentity.gperf"
+- {"Phi", 934},
+-#line 110 "htmlentity.gperf"
+- {"euro", 8364},
+-#line 111 "htmlentity.gperf"
+- {"exist", 8707},
+-#line 93 "htmlentity.gperf"
+- {"eacute", 233},
+- {""}, {""},
+-#line 195 "htmlentity.gperf"
+- {"ordm", 186},
+-#line 52 "htmlentity.gperf"
+- {"alpha", 945},
+-#line 285 "htmlentity.gperf"
+- {"Yacute", 221},
+- {""},
+-#line 290 "htmlentity.gperf"
+- {"Zeta", 918},
+-#line 174 "htmlentity.gperf"
+- {"nsub", 8836},
+- {""},
+-#line 70 "htmlentity.gperf"
+- {"Ccedil", 199},
+-#line 191 "htmlentity.gperf"
+- {"omicron", 959},
+-#line 291 "htmlentity.gperf"
+- {"zeta", 950},
+-#line 204 "htmlentity.gperf"
+- {"part", 8706},
+-#line 167 "htmlentity.gperf"
+- {"nabla", 8711},
+- {""},
+-#line 159 "htmlentity.gperf"
+- {"lt", 60},
+-#line 261 "htmlentity.gperf"
+- {"thetasym", 977},
+-#line 203 "htmlentity.gperf"
+- {"para", 182},
+-#line 188 "htmlentity.gperf"
+- {"Omega", 937},
+-#line 234 "htmlentity.gperf"
+- {"rsaquo", 8250},
+- {""},
+-#line 194 "htmlentity.gperf"
+- {"ordf", 170},
+- {""},
+-#line 187 "htmlentity.gperf"
+- {"oline", 8254},
+-#line 157 "htmlentity.gperf"
+- {"lsaquo", 8249},
+- {""},
+-#line 104 "htmlentity.gperf"
+- {"Eta", 919},
+- {""},
+-#line 215 "htmlentity.gperf"
+- {"Prime", 8243},
+-#line 71 "htmlentity.gperf"
+- {"ccedil", 231},
+- {""},
+-#line 247 "htmlentity.gperf"
+- {"sub", 8834},
+-#line 79 "htmlentity.gperf"
+- {"copy", 169},
+-#line 273 "htmlentity.gperf"
+- {"ucirc", 251},
+-#line 154 "htmlentity.gperf"
+- {"lowast", 8727},
+-#line 121 "htmlentity.gperf"
+- {"gt", 62},
+- {""}, {""},
+-#line 115 "htmlentity.gperf"
+- {"frac14", 188},
+-#line 170 "htmlentity.gperf"
+- {"ne", 8800},
+- {""}, {""}, {""}, {""},
+-#line 138 "htmlentity.gperf"
+- {"iquest", 191},
+- {""},
+-#line 257 "htmlentity.gperf"
+- {"tau", 964},
+-#line 136 "htmlentity.gperf"
+- {"Iota", 921},
+-#line 116 "htmlentity.gperf"
+- {"frac34", 190},
+-#line 269 "htmlentity.gperf"
+- {"uacute", 250},
+- {""},
+-#line 256 "htmlentity.gperf"
+- {"Tau", 932},
+-#line 78 "htmlentity.gperf"
+- {"cong", 8773},
+-#line 118 "htmlentity.gperf"
+- {"Gamma", 915},
+-#line 144 "htmlentity.gperf"
+- {"Lambda", 923},
+- {""}, {""}, {""}, {""},
+-#line 198 "htmlentity.gperf"
+- {"Otilde", 213},
+- {""},
+-#line 106 "htmlentity.gperf"
+- {"ETH", 208},
+-#line 134 "htmlentity.gperf"
+- {"infin", 8734},
+-#line 94 "htmlentity.gperf"
+- {"Ecirc", 202},
+- {""}, {""},
+-#line 66 "htmlentity.gperf"
+- {"beta", 946},
+- {""},
+-#line 272 "htmlentity.gperf"
+- {"Ucirc", 219},
+-#line 67 "htmlentity.gperf"
+- {"brvbar", 166},
+- {""},
+-#line 240 "htmlentity.gperf"
+- {"sect", 167},
+- {""},
+-#line 114 "htmlentity.gperf"
+- {"frac12", 189},
+-#line 82 "htmlentity.gperf"
+- {"curren", 164},
+- {""},
+-#line 73 "htmlentity.gperf"
+- {"cent", 162},
+- {""},
+-#line 181 "htmlentity.gperf"
+- {"Ocirc", 212},
+-#line 92 "htmlentity.gperf"
+- {"Eacute", 201},
+-#line 166 "htmlentity.gperf"
+- {"mu", 956},
+- {""}, {""}, {""},
+-#line 268 "htmlentity.gperf"
+- {"Uacute", 218},
+- {""}, {""}, {""}, {""}, {""},
+-#line 283 "htmlentity.gperf"
+- {"Xi", 926},
+-#line 55 "htmlentity.gperf"
+- {"ang", 8736},
+- {""}, {""},
+-#line 179 "htmlentity.gperf"
+- {"Oacute", 211},
+-#line 210 "htmlentity.gperf"
+- {"pi", 960},
+- {""},
+-#line 85 "htmlentity.gperf"
+- {"darr", 8595},
+-#line 103 "htmlentity.gperf"
+- {"equiv", 8801},
+-#line 286 "htmlentity.gperf"
+- {"yacute", 253},
+-#line 56 "htmlentity.gperf"
+- {"apos", 39},
+-#line 206 "htmlentity.gperf"
+- {"perp", 8869},
+- {""}, {""}, {""}, {""}, {""},
+-#line 89 "htmlentity.gperf"
+- {"delta", 948},
+-#line 221 "htmlentity.gperf"
+- {"radic", 8730},
+-#line 152 "htmlentity.gperf"
+- {"le", 8804},
+-#line 220 "htmlentity.gperf"
+- {"quot", 34},
+- {""},
+-#line 202 "htmlentity.gperf"
+- {"ouml", 246},
+-#line 80 "htmlentity.gperf"
+- {"crarr", 8629},
+- {""},
+-#line 171 "htmlentity.gperf"
+- {"ni", 8715},
+-#line 241 "htmlentity.gperf"
+- {"shy", 173},
+-#line 63 "htmlentity.gperf"
+- {"auml", 228},
+- {""}, {""},
+-#line 190 "htmlentity.gperf"
+- {"Omicron", 927},
+- {""},
+-#line 141 "htmlentity.gperf"
+- {"iuml", 239},
+-#line 58 "htmlentity.gperf"
+- {"aring", 229},
+-#line 60 "htmlentity.gperf"
+- {"Atilde", 195},
+- {""}, {""},
+-#line 109 "htmlentity.gperf"
+- {"euml", 235},
+-#line 90 "htmlentity.gperf"
+- {"diams", 9830},
+-#line 120 "htmlentity.gperf"
+- {"ge", 8805},
+- {""}, {""},
+-#line 289 "htmlentity.gperf"
+- {"Yuml", 376},
+-#line 98 "htmlentity.gperf"
+- {"empty", 8709},
+-#line 91 "htmlentity.gperf"
+- {"divide", 247},
+-#line 284 "htmlentity.gperf"
+- {"xi", 958},
+-#line 276 "htmlentity.gperf"
+- {"uml", 168},
+-#line 246 "htmlentity.gperf"
+- {"spades", 9824},
+-#line 77 "htmlentity.gperf"
+- {"clubs", 9827},
+-#line 83 "htmlentity.gperf"
+- {"dagger", 8224},
+- {""},
+-#line 65 "htmlentity.gperf"
+- {"Beta", 914},
+-#line 68 "htmlentity.gperf"
+- {"bull", 8226},
+-#line 43 "htmlentity.gperf"
+- {"Acirc", 194},
+-#line 145 "htmlentity.gperf"
+- {"lambda", 955},
+-#line 112 "htmlentity.gperf"
+- {"fnof", 402},
+-#line 236 "htmlentity.gperf"
+- {"sbquo", 8218},
+-#line 222 "htmlentity.gperf"
+- {"rang", 9002},
+-#line 128 "htmlentity.gperf"
+- {"Icirc", 206},
+- {""},
+-#line 50 "htmlentity.gperf"
+- {"alefsym", 8501},
+-#line 64 "htmlentity.gperf"
+- {"bdquo", 8222},
+-#line 146 "htmlentity.gperf"
+- {"lang", 9001},
+-#line 226 "htmlentity.gperf"
+- {"rceil", 8969},
+- {""}, {""},
+-#line 211 "htmlentity.gperf"
+- {"piv", 982},
+-#line 293 "htmlentity.gperf"
+- {"zwnj", 8204},
+-#line 150 "htmlentity.gperf"
+- {"lceil", 8968},
+-#line 41 "htmlentity.gperf"
+- {"Aacute", 193},
+- {""},
+-#line 249 "htmlentity.gperf"
+- {"sum", 8721},
+-#line 270 "htmlentity.gperf"
+- {"uarr", 8593},
+-#line 282 "htmlentity.gperf"
+- {"weierp", 8472},
+-#line 126 "htmlentity.gperf"
+- {"Iacute", 205},
+-#line 287 "htmlentity.gperf"
+- {"yen", 165},
+-#line 235 "htmlentity.gperf"
+- {"rsquo", 8217},
+-#line 88 "htmlentity.gperf"
+- {"Delta", 916},
+-#line 119 "htmlentity.gperf"
+- {"gamma", 947},
+- {""}, {""},
+-#line 158 "htmlentity.gperf"
+- {"lsquo", 8216},
+-#line 86 "htmlentity.gperf"
+- {"dArr", 8659},
+-#line 51 "htmlentity.gperf"
+- {"Alpha", 913},
+- {""}, {""}, {""},
+-#line 281 "htmlentity.gperf"
+- {"uuml", 252},
+- {""}, {""}, {""},
+-#line 227 "htmlentity.gperf"
+- {"rdquo", 8221},
+-#line 160 "htmlentity.gperf"
+- {"macr", 175},
+-#line 263 "htmlentity.gperf"
+- {"THORN", 222},
+- {""}, {""},
+-#line 151 "htmlentity.gperf"
+- {"ldquo", 8220},
+-#line 224 "htmlentity.gperf"
+- {"rarr", 8594},
+- {""},
+-#line 197 "htmlentity.gperf"
+- {"oslash", 248},
+- {""},
+-#line 228 "htmlentity.gperf"
+- {"real", 8476},
+-#line 148 "htmlentity.gperf"
+- {"larr", 8592},
+- {""}, {""}, {""}, {""}, {""}, {""},
+-#line 84 "htmlentity.gperf"
+- {"Dagger", 8225},
+-#line 209 "htmlentity.gperf"
+- {"Pi", 928},
+- {""}, {""},
+-#line 205 "htmlentity.gperf"
+- {"permil", 8240},
+-#line 212 "htmlentity.gperf"
+- {"plusmn", 177},
+- {""}, {""},
+-#line 108 "htmlentity.gperf"
+- {"Euml", 203},
+-#line 265 "htmlentity.gperf"
+- {"tilde", 732},
+-#line 163 "htmlentity.gperf"
+- {"middot", 183},
+- {""},
+-#line 192 "htmlentity.gperf"
+- {"oplus", 8853},
+-#line 280 "htmlentity.gperf"
+- {"Uuml", 220},
+-#line 242 "htmlentity.gperf"
+- {"Sigma", 931},
+-#line 186 "htmlentity.gperf"
+- {"ograve", 242},
+- {""}, {""},
+-#line 117 "htmlentity.gperf"
+- {"frasl", 8260},
+-#line 255 "htmlentity.gperf"
+- {"szlig", 223},
+-#line 49 "htmlentity.gperf"
+- {"agrave", 224},
+- {""},
+-#line 156 "htmlentity.gperf"
+- {"lrm", 8206},
+-#line 201 "htmlentity.gperf"
+- {"Ouml", 214},
+- {""},
+-#line 132 "htmlentity.gperf"
+- {"igrave", 236},
+- {""},
+-#line 223 "htmlentity.gperf"
+- {"raquo", 187},
+-#line 288 "htmlentity.gperf"
+- {"yuml", 255},
+-#line 243 "htmlentity.gperf"
+- {"sigma", 963},
+-#line 97 "htmlentity.gperf"
+- {"egrave", 232},
+-#line 87 "htmlentity.gperf"
+- {"deg", 176},
+-#line 147 "htmlentity.gperf"
+- {"laquo", 171},
+- {""},
+-#line 102 "htmlentity.gperf"
+- {"epsilon", 949},
+- {""}, {""}, {""},
+-#line 271 "htmlentity.gperf"
+- {"uArr", 8657},
+- {""}, {""}, {""}, {""},
+-#line 72 "htmlentity.gperf"
+- {"cedil", 184},
+-#line 124 "htmlentity.gperf"
+- {"hearts", 9829},
+- {""}, {""}, {""},
+-#line 130 "htmlentity.gperf"
+- {"iexcl", 161},
+-#line 266 "htmlentity.gperf"
+- {"times", 215},
+-#line 230 "htmlentity.gperf"
+- {"rfloor", 8971},
+- {""}, {""}, {""}, {""},
+-#line 153 "htmlentity.gperf"
+- {"lfloor", 8970},
+- {""}, {""}, {""},
+-#line 162 "htmlentity.gperf"
+- {"micro", 181},
+- {""}, {""}, {""},
+-#line 225 "htmlentity.gperf"
+- {"rArr", 8658},
+- {""}, {""}, {""}, {""},
+-#line 149 "htmlentity.gperf"
+- {"lArr", 8656},
+- {""}, {""}, {""}, {""},
+-#line 76 "htmlentity.gperf"
+- {"circ", 710},
+-#line 164 "htmlentity.gperf"
+- {"minus", 8722},
+- {""}, {""}, {""}, {""}, {""},
+-#line 275 "htmlentity.gperf"
+- {"ugrave", 249},
+- {""}, {""}, {""},
+-#line 279 "htmlentity.gperf"
+- {"upsilon", 965},
+- {""}, {""}, {""},
+-#line 62 "htmlentity.gperf"
+- {"Auml", 196},
+-#line 113 "htmlentity.gperf"
+- {"forall", 8704},
+- {""}, {""}, {""},
+-#line 140 "htmlentity.gperf"
+- {"Iuml", 207},
+-#line 57 "htmlentity.gperf"
+- {"Aring", 197},
+- {""}, {""}, {""}, {""},
+-#line 183 "htmlentity.gperf"
+- {"OElig", 338},
+-#line 196 "htmlentity.gperf"
+- {"Oslash", 216},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 96 "htmlentity.gperf"
+- {"Egrave", 200},
+- {""}, {""},
+-#line 122 "htmlentity.gperf"
+- {"harr", 8596},
+-#line 101 "htmlentity.gperf"
+- {"Epsilon", 917},
+-#line 274 "htmlentity.gperf"
+- {"Ugrave", 217},
+- {""}, {""}, {""},
+-#line 278 "htmlentity.gperf"
+- {"Upsilon", 933},
+- {""},
+-#line 229 "htmlentity.gperf"
+- {"reg", 174},
+-#line 233 "htmlentity.gperf"
+- {"rlm", 8207},
+- {""}, {""},
+-#line 185 "htmlentity.gperf"
+- {"Ograve", 210},
+- {""}, {""},
+-#line 184 "htmlentity.gperf"
+- {"oelig", 339},
+-#line 125 "htmlentity.gperf"
+- {"hellip", 8230},
+- {""}, {""}, {""},
+-#line 47 "htmlentity.gperf"
+- {"aelig", 230},
+-#line 169 "htmlentity.gperf"
+- {"ndash", 8211},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 245 "htmlentity.gperf"
+- {"sim", 8764},
+- {""}, {""}, {""}, {""},
+-#line 292 "htmlentity.gperf"
+- {"zwj", 8205},
+- {""}, {""}, {""}, {""}, {""}, {""},
+-#line 46 "htmlentity.gperf"
+- {"AElig", 198},
+- {""}, {""},
+-#line 107 "htmlentity.gperf"
+- {"eth", 240},
+- {""},
+-#line 244 "htmlentity.gperf"
+- {"sigmaf", 962},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 123 "htmlentity.gperf"
+- {"hArr", 8660},
+- {""},
+-#line 48 "htmlentity.gperf"
+- {"Agrave", 192},
+- {""}, {""}, {""}, {""},
+-#line 131 "htmlentity.gperf"
+- {"Igrave", 204},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""},
+-#line 161 "htmlentity.gperf"
+- {"mdash", 8212},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+- {""}, {""}, {""}, {""},
+-#line 277 "htmlentity.gperf"
+- {"upsih", 978}
+- };
+-
+- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+- {
+- register int key = hash (str, len);
+-
+- if (key <= MAX_HASH_VALUE && key >= 0)
+- if (len == lengthtable[key])
+- {
+- register const char *s = wordlist[key].name;
+-
+- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
+- return &wordlist[key];
+- }
+- }
+- return 0;
+-}
+-#line 294 "htmlentity.gperf"
+-
+-gulong
+-html_entity_parse (const gchar *s, guint len)
+-{
+- struct _EntityEntry * result = html_entity_hash( s, len);
+- if (result == NULL )
+- return ' ';
+- return result->value;
+-}
+--
+2.11.1
+
diff --git a/nonprism/grilo-plugins/PKGBUILD b/nonprism/grilo-plugins/PKGBUILD
index 82e9120b4..5a0ef5b6e 100644
--- a/nonprism/grilo-plugins/PKGBUILD
+++ b/nonprism/grilo-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 276945 2016-09-25 12:40:13Z heftig $
+# $Id: PKGBUILD 289119 2017-02-17 22:41:29Z heftig $
# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=grilo-plugins
-pkgver=0.3.3+7+gab5596b
+pkgver=0.3.4
pkgrel=1.nonprism1
pkgdesc="A collection of plugins for the Grilo framework, without libgdata support"
url="https://git.gnome.org/browse/grilo-plugins"
@@ -11,15 +11,22 @@ arch=(i686 x86_64)
license=(LGPL)
depends=(grilo lua libmediaart libtracker-sparql gom libdmapsharing chromaprint
gst-plugins-bad)
-makedepends=(intltool itstool yelp-tools git gnome-common python)
+makedepends=(git meson gperf)
+checkdepends=(gst-plugins-good gst-plugins-base)
optdepends=('dleyna-server: DLNA plugin'
'tracker: Tracker plugin')
replaces=(${pkgname}-nonprism)
conflicts=(${pkgname}-nonprism)
groups=(gnome)
-_commit=ab5596b7372a3d9b4a74fc3ff4daa669797a6c5a
-source=("git://git.gnome.org/grilo-plugins#commit=$_commit")
-sha256sums=('SKIP')
+_commit=9e4026978b4069468a6fe6d3e961c4d1a9c88051 # tags/grilo-plugins-0.3.4^0
+source=("git+https://git.gnome.org/browse/grilo-plugins#commit=$_commit"
+ 0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch
+ 0002-lua-factory-Remove-generated-htmlentity.c.patch
+ 0001-meson-Fix-library-name-of-optical-media-plugin.patch)
+sha256sums=('SKIP'
+ 'f13466194a7f6f923189563814aa40c2cafe2cee7a9f5b86d5e0208bd1840111'
+ '4c9a2eaa9bba70e39fe65eb0ef06207f7553341c51d0d8bcab9c5934b30e7aea'
+ 'a1a48c04892adc3dab9b71d59eb464eadf5c72fffe3a13a9e5c078421288baee')
pkgver() {
cd $pkgname
@@ -27,25 +34,26 @@ pkgver() {
}
prepare() {
+ mkdir build
cd $pkgname
- # Add missing tag for pkgver()
- git tag -f grilo-plugins-0.3.3 7a29a3ba6b0874e39fc664407cfcb2298906163a
- NOCONFIGURE=1 ./autogen.sh
+ patch -Np1 -i ../0001-lua-factory-Remove-bad-prototype-for-html_entity_has.patch
+ patch -Np1 -i ../0002-lua-factory-Remove-generated-htmlentity.c.patch
+ patch -Np1 -i ../0001-meson-Fix-library-name-of-optical-media-plugin.patch
}
build() {
- cd $pkgname
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
+ cd build
+ export LANG=en_US.UTF-8
+ meson --prefix=/usr --buildtype=plain ../$pkgname
+ ninja
}
check() {
- cd $pkgname
- make -k check || :
+ cd build
+ ninja test
}
package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
+ cd build
+ DESTDIR="$pkgdir" ninja install
}