Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1937 from alihanozturk/master

Browse Source 
update
This commit is contained in:
Burak Fazil Erturk
2016-06-12 21:45:29 +03:00
committed by GitHub
parent 7788d12d6b a4f715c9bf
commit 33a82177f8
24 changed files with 86451 additions and 85118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/gnome/base/gconf/actions.py
Executable
+36
View File
@@ -0,0 +1,36 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 2
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
from pisi.actionsapi import shelltools
def setup():
#autotools.autoreconf("-fiv")
shelltools.system("sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert")
autotools.configure("--prefix=/usr \
--libexecdir=/usr/lib/GConf \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
--disable-orbit \
--enable-defaults-service \
--with-pic \
--with-gtk=3.0 \
")
#pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""')
#pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE")
pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ")
def build():
autotools.make("pkglibdir=/usr/lib/GConf")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("README", "TODO", "NEWS", "ChangeLog", "AUTHORS")
desktop/gnome/base/gconf/comar/pakhandler.py
Executable
+38
View File
@@ -0,0 +1,38 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
import piksemel
import os
def installGconfSchemas(filepath):
os.environ['GCONF_CONFIG_SOURCE'] = 'xml:merged:/etc/gconf/gconf.xml.defaults'
parse = piksemel.parse(filepath)
schemas = []
for schema in parse.tags("File"):
path = schema.getTagData("Path")
if path.startswith("etc/gconf/schemas"):
schemas.append("/"+path)
if schemas:
os.system("/usr/bin/gconftool-2 --makefile-install-rule %s" % " ".join(schemas))
def uninstallGconfSchemas(filepath):
os.environ['GCONF_CONFIG_SOURCE'] = 'xml:merged:/etc/gconf/gconf.xml.defaults'
parse = piksemel.parse(filepath)
schemas = []
for schema in parse.tags("File"):
path = schema.getTagData("Path")
if path.startswith("etc/gconf/schemas"):
schemas.append("/"+path)
if schemas:
os.system("/usr/bin/gconftool-2 --makefile-uninstall-rule %s" % " ".join(schemas))
def setupPackage(metapath, filepath):
installGconfSchemas(filepath)
def cleanupPackage(metapath, filepath):
uninstallGconfSchemas(filepath)
def postCleanupPackage(metapath, filepath):
pass
desktop/gnome/base/gconf/files/01_xml-gettext-domain.patch
Executable
+362
View File
@@ -0,0 +1,362 @@
# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
# Ubuntu: https://bugs.launchpad.net/bugs/123025
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
--- GConf-2.26.0/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400
+++ GConf-2.26.0/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400
@@ -52,6 +52,7 @@ struct _MarkupEntry
char *schema_name;
char *mod_user;
GTime mod_time;
+ const char *gettext_domain;
};
static LocalSchemaInfo* local_schema_info_new (void);
@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry
gconf_schema_get_type (schema));
gconf_schema_set_owner (current_schema,
gconf_schema_get_owner (schema));
+ gconf_schema_set_gettext_domain (current_schema,
+ gconf_schema_get_gettext_domain (schema));
}
/* Update mod time */
@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
else if (c_local_schema && c_local_schema->long_desc)
gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
+ gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
+
return retval;
}
}
@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
const char *ltype;
const char *list_type;
const char *owner;
+
GConfValueType vtype;
- const char *dummy1, *dummy2, *dummy3, *dummy4;
+ const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
#if 0
g_assert (ELEMENT_IS ("entry") ||
@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
"muser", &dummy2,
"mtime", &dummy3,
"schema", &dummy4,
+ "gettext_domain", &dummy5,
NULL))
return;
@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
const char *mtime;
const char *schema;
const char *type;
+ const char *gettext_domain;
const char *dummy1, *dummy2, *dummy3, *dummy4;
const char *dummy5, *dummy6, *dummy7;
GConfValue *value;
@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
mtime = NULL;
schema = NULL;
type = NULL;
+ gettext_domain = NULL;
if (!locate_attributes (context, element_name, attribute_names, attribute_values,
error,
@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
"mtime", &mtime,
"schema", &schema,
"type", &type,
+ "gettext_domain", &gettext_domain,
/* These are allowed but we don't use them until
* parse_value_element
@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
*/
if (schema)
entry->schema_name = g_strdup (schema);
+
+ if (gettext_domain)
+ entry->gettext_domain = g_intern_string (gettext_domain);
}
else
{
@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
GConfSchema *schema;
GConfValueType stype;
const char *owner;
+ const char *gettext_domain;
schema = gconf_value_get_schema (value);
@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
g_free (s);
}
+
+ gettext_domain = gconf_schema_get_gettext_domain (schema);
+
+ if (gettext_domain)
+ {
+ char *s;
+
+ s = g_markup_escape_text (gettext_domain, -1);
+
+ if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
+ {
+ g_free (s);
+ return FALSE;
+ }
+
+ g_free (s);
+ }
if (stype == GCONF_VALUE_LIST)
{
diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
--- GConf-2.26.0/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400
+++ GConf-2.26.0/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400
@@ -7,7 +7,7 @@
<!-- A single schema. What I am trying to say is "this set of
elements, in any order". Duplicate elements (apart from <locale>) are
not allowed). -->
-<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*>
+<!ELEMENT schema (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*>
<!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
<!ELEMENT key (#PCDATA)>
diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
--- GConf-2.26.0/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400
+++ GConf-2.26.0/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400
@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
+ cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : "");
{
gchar* encoded;
@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
gconf_schema_set_owner(sc, cs->owner);
}
+ if (*cs->gettext_domain != '\0')
+ {
+ if (!g_utf8_validate (cs->gettext_domain, -1, NULL))
+ gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema"));
+ else
+ gconf_schema_set_gettext_domain(sc, cs->gettext_domain);
+ }
+
{
GConfValue* val;
diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
--- GConf-2.26.0/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400
+++ GConf-2.26.0/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400
@@ -32,9 +32,10 @@ typedef struct {
GConfValueType car_type; /* Pair car type of the described entry */
GConfValueType cdr_type; /* Pair cdr type of the described entry */
gchar* locale; /* Schema locale */
- gchar* owner; /* Name of creating application */
+ const gchar* owner; /* Name of creating application */
gchar* short_desc; /* 40 char or less description, no newlines */
gchar* long_desc; /* could be a paragraph or so */
+ const gchar* gettext_domain; /* description gettext domain */
GConfValue* default_value; /* Default value of the key */
} GConfRealSchema;
@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
g_free (real->locale);
g_free (real->short_desc);
g_free (real->long_desc);
- g_free (real->owner);
if (real->default_value)
gconf_value_free (real->default_value);
@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
dest->long_desc = g_strdup (real->long_desc);
- dest->owner = g_strdup (real->owner);
+ dest->gettext_domain = real->gettext_domain;
+
+ dest->owner = real->owner;
dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
REAL_SCHEMA (sc)->locale = NULL;
}
+void
+gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
+{
+ g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
+
+ if (domain)
+ REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain);
+ else
+ REAL_SCHEMA (sc)->gettext_domain = NULL;
+}
+
void
gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
{
@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
{
g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
- if (REAL_SCHEMA (sc)->owner)
- g_free (REAL_SCHEMA (sc)->owner);
-
if (owner)
- REAL_SCHEMA (sc)->owner = g_strdup (owner);
+ REAL_SCHEMA (sc)->owner = g_intern_string (owner);
else
REAL_SCHEMA (sc)->owner = NULL;
}
@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
return FALSE;
}
+ if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
+ {
+ g_set_error (err, GCONF_ERROR,
+ GCONF_ERROR_FAILED,
+ _("Schema contains invalid UTF-8"));
+ return FALSE;
+ }
+
if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
{
g_set_error (err, GCONF_ERROR,
@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
}
const char*
+gconf_schema_get_gettext_domain (const GConfSchema *schema)
+{
+ g_return_val_if_fail (schema != NULL, NULL);
+
+ return REAL_SCHEMA (schema)->gettext_domain;
+}
+
+static inline const char *
+schema_translate (const GConfSchema *schema,
+ const char *string)
+{
+ if (REAL_SCHEMA (schema)->gettext_domain)
+ {
+ bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8");
+ return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string);
+ }
+ else
+ return string;
+}
+
+const char*
gconf_schema_get_short_desc (const GConfSchema *schema)
{
g_return_val_if_fail (schema != NULL, NULL);
- return REAL_SCHEMA (schema)->short_desc;
+ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc);
}
const char*
@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
{
g_return_val_if_fail (schema != NULL, NULL);
- return REAL_SCHEMA (schema)->long_desc;
+ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc);
}
const char*
diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
--- GConf-2.26.0/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400
+++ GConf-2.26.0/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400
@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type
GConfValueType type);
void gconf_schema_set_locale (GConfSchema *sc,
const gchar *locale);
+void gconf_schema_set_gettext_domain (GConfSchema *sc,
+ const gchar *domain);
void gconf_schema_set_short_desc (GConfSchema *sc,
const gchar *desc);
void gconf_schema_set_long_desc (GConfSchema *sc,
@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
GConfValueType gconf_schema_get_car_type (const GConfSchema *schema);
GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema);
const char* gconf_schema_get_locale (const GConfSchema *schema);
+const char* gconf_schema_get_gettext_domain(const GConfSchema *schema);
const char* gconf_schema_get_short_desc (const GConfSchema *schema);
const char* gconf_schema_get_long_desc (const GConfSchema *schema);
const char* gconf_schema_get_owner (const GConfSchema *schema);
diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
--- GConf-2.26.0/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400
+++ GConf-2.26.0/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400
@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
GConfValueType cdr_type;
GConfValue* global_default;
GHashTable* hash;
+ gchar* gettext_domain;
};
static int
@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
else
g_printerr (_("WARNING: empty <applyto> node"));
}
+ else if (strcmp((char *)iter->name, "gettext_domain") == 0)
+ {
+ tmp = (char *)xmlNodeGetContent(iter);
+ if (tmp)
+ {
+ info->gettext_domain = g_strdup(tmp);
+ xmlFree(tmp);
+ }
+ }
else
g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
iter->name);
@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
if (info->owner != NULL)
gconf_schema_set_owner(schema, info->owner);
+ if (info->gettext_domain != NULL)
+ gconf_schema_set_gettext_domain(schema, info->gettext_domain);
+
xmlFree(name);
/* Locale-specific info */
@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
info.apply_to = NULL;
info.owner = NULL;
info.global_default = NULL;
+ info.gettext_domain = NULL;
info.hash = g_hash_table_new(g_str_hash, g_str_equal);
extract_global_info(node, &info);
@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
; /* nothing */
else if (strcmp((char *)iter->name, "applyto") == 0)
; /* nothing */
+ else if (strcmp((char *)iter->name, "gettext_domain") == 0)
+ ; /* nothing */
else if (strcmp((char *)iter->name, "locale") == 0)
{
process_locale_info(iter, &info);
diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
--- GConf-2.26.0/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400
+++ GConf-2.26.0/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400
@@ -16,6 +16,7 @@ struct ConfigSchema {
string short_desc;
string long_desc;
string owner;
+ string gettext_domain;
// Work around lack of recursive data types
string encoded_default_value;
};
desktop/gnome/base/gconf/files/gconf-reload.patch
Executable
+20
View File
@@ -0,0 +1,20 @@
--- GConf-2.16.0/gconf/gconftool.c.orig 2006-10-14 17:37:14.000000000 +0000
+++ GConf-2.16.0/gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000
@@ -963,6 +963,8 @@ main (int argc, char** argv)
gconf_engine_unref (conf);
+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
+
return retval;
}
@@ -975,6 +977,8 @@ main (int argc, char** argv)
gconf_engine_unref (conf);
+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
+
return retval;
}
desktop/gnome/base/gconf/files/gconf2.path
Executable
+30
View File
@@ -0,0 +1,30 @@
# This file stores the addresses of config sources for GConf
# When a value is stored or requested, the sources are scanned from top to
# bottom, and the first one to have a value for the key (or the first one
# to be writeable) is used to load/store the data.
# See the GConf manual for details
# Look first in systemwide mandatory settings directory
xml:readonly:/etc/gconf/gconf.xml.mandatory
# To read in any mandatory settings that the Sys Admin may have created
# prior to a desktop system upgrade. The SysAdmin can stick read-only system
# wide sources in this file.
include /etc/gconf/2/local-mandatory.path
# Now see where users want us to look - basically the user can stick arbitrary
# sources in a ~/.gconf.path file and they're inserted here
include "$(HOME)/.gconf.path"
# Give users a default storage location, ~/.gconf
xml:readwrite:$(HOME)/.gconf
# To read in any defaults settings that the Sys Admin may have created
# prior to a desktop system upgrade. The SysAdmin can stick default values
# system-wide in this file.
include /etc/gconf/2/local-defaults.path
# Finally, look at the systemwide defaults
xml:readonly:/etc/gconf/gconf.xml.defaults
desktop/gnome/base/gconf/pspec.xml
Executable
+109
View File
@@ -0,0 +1,109 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>gconf</Name>
<Homepage>http://www.gnome.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2.1</License>
<IsA>library</IsA>
<Summary>Gnome Configuration System</Summary>
<Description>gconf is a Gnome Configuration System.</Description>
<Archive sha1sum="a90d3ac08dc454f927c8d3024f52d4d57e3ff613" type="tarxz">mirrors://gnome/GConf/3.2/GConf-3.2.6.tar.xz</Archive>
<BuildDependencies>
<Dependency>glib2-devel</Dependency>
<Dependency>gtk-doc</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>dbus-glib-devel</Dependency>
<Dependency>polkit-devel</Dependency>
<Dependency>openldap-client</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>intltool</Dependency>
<Dependency>python-lxml</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">01_xml-gettext-domain.patch</Patch>
<Patch level="1">gconf-reload.patch</Patch>
</Patches>
</Source>
<Package>
<Name>gconf</Name>
<RuntimeDependencies>
<Dependency>dbus</Dependency>
<Dependency>glib2</Dependency>
<Dependency>polkit</Dependency>
<Dependency>libxml2</Dependency>
<Dependency>dbus-glib</Dependency>
<Dependency>openldap-client</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc/dbus-1/system.d</Path>
<Path fileType="config">/etc/gconf</Path>
<Path fileType="config">/etc/xdg/autostart</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/libgconf*</Path>
<Path fileType="library">/usr/lib/GConf</Path>
<Path fileType="library">/usr/lib/gio</Path>
<Path fileType="library">/usr/lib/girepository-1.0</Path>
<Path fileType="data">/usr/share/dbus-1</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/GConf</Path>
<Path fileType="data">/usr/share/aclocal</Path>
<Path fileType="data">/usr/share/gir-1.0</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="data">/usr/share/polkit-1/actions</Path>
<Path fileType="data">/usr/share/sgml/gconf</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/etc/gconf/2/path">gconf2.path</AdditionalFile>
</AdditionalFiles>
<Provides>
<COMAR script="pakhandler.py">System.PackageHandler</COMAR>
</Provides>
</Package>
<Package>
<Name>gconf-docs</Name>
<IsA>data:doc</IsA>
<Summary>GConf reference documents</Summary>
<RuntimeDependencies>
<Dependency release="current">gconf</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/gtk-doc</Path>
</Files>
</Package>
<Package>
<Name>gconf-devel</Name>
<Summary>Development files for gconf</Summary>
<RuntimeDependencies>
<Dependency release="current">gconf</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>python-lxml</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-05-05</Date>
<Version>3.2.6</Version>
<Comment>First release</Comment>
<Name>Erdinç Gültekin</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
desktop/gnome/base/gconf/translations.xml
Executable
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>gconf</Name>
<Summary xml:lang="tr">Gnome Konfigürasyon Sistemi</Summary>
<Description xml:lang="tr">gconf, Gnome Konfigürasyon Sistemidir.</Description>
</Source>
<Package>
<Name>gconf-devel</Name>
<Summary xml:lang="tr">gconf için geliştirme dosyaları</Summary>
</Package>
</PISI>
desktop/kde/utils/kcalc/pspec.xml
+8 -1
View File
@@ -14,7 +14,7 @@
<IsA>app:gui</IsA>
<Summary>A scientific calculator</Summary>
<Description>KCalc is a calculator which offers many more mathematical functions than meet the eye on a first glance.</Description>
<Archive sha1sum="6067fd5f91a6b69376104c19485ca83ac6aa1991" type="tarxz">mirrors://kde/stable/applications/16.04.0/src/kcalc-16.04.0.tar.xz</Archive>
<Archive sha1sum="e1ca79ecae6f54b35c151ff1b127912dc267d01f" type="tarxz">mirrors://kde/stable/applications/16.04.1/src/kcalc-16.04.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
@@ -56,6 +56,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-06-12</Date>
<Version>16.04.1</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-05-23</Date>
<Version>16.04.0</Version>
multimedia/misc/orc/pspec.xml
+8 -7
View File
@@ -1,3 +1,4 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
@@ -13,9 +14,9 @@
<IsA>app:console</IsA>
<Summary>The Oil Runtime Compiler</Summary>
<Description>Optimized Inner Loop Runtime Compiler</Description>
<Archive sha1sum="6186a6a5faefe6b61d55e5406c7365d69b91c982" type="targz">http://gstreamer.freedesktop.org/src/orc/orc-0.4.19.tar.gz</Archive>
<Archive sha1sum="1cc2205e91d283519109b2c851ddf98a4f60f9e9" type="tarxz">https://gstreamer.freedesktop.org/src/orc/orc-0.4.25.tar.xz</Archive>
<BuildDependencies>
<!--Dependency>valgrind</Dependency-->
<Dependency>valgrind</Dependency>
</BuildDependencies>
</Source>
@@ -56,11 +57,11 @@
<History>
<Update release="3">
<Date>2016-06-09</Date>
<Version>0.4.19</Version>
<Comment>Release Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
<Date>2016-06-12</Date>
<Version>0.4.25</Version>
<Comment>Version bump</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-05-27</Date>
multimedia/video/ffmpeg/actions.py
+1 -1
View File
@@ -54,7 +54,6 @@ def setup():
--enable-libcelt \
--enable-frei0r \
--enable-libcdio \
--enable-libvo-aacenc \
--enable-libvo-amrwbenc \
--enable-nonfree \
--enable-libfaac")
@@ -62,6 +61,7 @@ def setup():
def build():
autotools.make()
autotools.make('tools/qt-faststart')
autotools.make("doc/ff{mpeg,play,server}.1")
def install():
autotools.rawInstall("DESTDIR=%s install-man" % get.installDIR())
multimedia/video/ffmpeg/pspec.xml
+9 -1
View File
@@ -15,7 +15,7 @@
<IsA>app:console</IsA>
<Summary>A command-line tool to record, convert and stream audio and video</Summary>
<Description>FFmpeg is a complete solution to record, convert and stream audio and video.</Description>
<Archive sha1sum="974f470b551e745bbfb836c71a6a987be974faaf" type="tarbz2">http://ffmpeg.org/releases/ffmpeg-2.8.6.tar.bz2</Archive>
<Archive sha1sum="ac3341269fe89a41892e8696465b859e1f425213" type="tarxz">http://ffmpeg.org/releases/ffmpeg-3.0.2.tar.xz</Archive>
<BuildDependencies>
<Dependency>freetype-devel</Dependency>
<Dependency>faac-devel</Dependency>
@@ -43,6 +43,7 @@
<Dependency>rtmpdump-devel</Dependency>
<Dependency>schroedinger-devel</Dependency>
<Dependency>speex-devel</Dependency>
<Dependency>yasm-devel</Dependency>
<Dependency>libv4l-devel</Dependency>
<Dependency>libvo-amrwbenc-devel</Dependency>
<Dependency>libvo-aacenc-devel</Dependency>
@@ -124,6 +125,13 @@
<History>
<Update release="3">
<Date>2016-06-12</Date>
<Version>3.0.2</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>2.8.6</Version>
multimedia/video/l-smash/actions.py
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
autotools.rawConfigure("--prefix='/usr' \
--enable-shared \
--disable-static")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("LICENSE")
multimedia/video/l-smash/pspec.xml
+51
View File
@@ -0,0 +1,51 @@
<PISI>
<Source>
<Name>l-smash</Name>
<Homepage>https://github.com/l-smash/l-smash</Homepage>
<Packager>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Packager>
<License>custom</License>
<IsA>app:console</IsA>
<Summary>MP4 muxer and other tools.</Summary>
<Description>Loyal to Spec of MPEG4, and Ad-hock Simple Hackwork library.</Description>
<Archive sha1sum="acd6884c25cd362e4dcfbeb99fc725ad535f6c79" type="targz">https://github.com/l-smash/l-smash/archive/v2.9.1.tar.gz</Archive>
</Source>
<Package>
<Name>l-smash</Name>
<Summary>MP4 muxer and other tools.</Summary>
<RuntimeDependencies>
<Dependency>glibc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>l-smash-devel</Name>
<Summary>Development files for l-smash.</Summary>
<RuntimeDependencies>
<Dependency release="current">l-smash</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="header">/usr/include</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-06-12</Date>
<Version>2.9.1</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
multimedia/video/libvpx/actions.py
+6 -9
View File
@@ -9,29 +9,26 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
#WorkDir = "libvpx"
# libdir = "lib64" if get.ARCH() == "x86_64" else "lib"
libdir = "lib"
def setup():
shelltools.export("LC_ALL", "en_US.UTF-8")
shelltools.export("CFLAGS", get.CFLAGS().replace("-ggdb3", ""))
autotools.rawConfigure("--prefix=/usr \
--libdir=/usr/%s \
--enable-pic \
--enable-vp8 \
--enable-vp9 \
--enable-vp9-highbitdepth \
--enable-shared \
--enable-runtime-cpu-detect \
--enable-postproc \
--enable-multithread \
--enable-experimental \
--enable-spatial-svc \
--disable-install-docs \
--disable-debug \
--disable-debug-libs" % libdir)
--disable-install-srcs" % libdir)
def build():
autotools.make("verbose=true")
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
multimedia/video/libvpx/files/0001-Fix-for-issue-1114-compile-error.patch
+316
View File
@@ -0,0 +1,316 @@
From 7361ef732b432e153496c30da66081d7e530c7f6 Mon Sep 17 00:00:00 2001
From: Peter de Rivaz <peter.derivaz@argondesign.com>
Date: Mon, 14 Dec 2015 16:35:29 +0000
Subject: [PATCH] Fix for issue 1114 compile error
In 32-bit build with --enable-shared, there is a lot of
register pressure and register src_strideq is reused.
The code needs to use the stack based version of src_stride,
but this doesn't compile when used in an lea instruction.
This patch also fixes a related segmentation fault caused by the
implementation using src_strideq even though it has been
reused.
This patch also fixes the HBD subpel variance tests that fail
when compiled without disable-optimizations.
These failures were caused by local variables in the assembler
routines colliding with the caller's stack frame.
Change-Id: Ice9d4dafdcbdc6038ad5ee7c1c09a8f06deca362
---
vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm | 18 +++----
vpx_dsp/x86/highbd_variance_sse2.c | 64 ++++++++++++++----------
2 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm b/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
index 22d52a2..30ee81b 100644
--- a/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
+++ b/vpx_dsp/x86/highbd_subpel_variance_impl_sse2.asm
@@ -79,20 +79,13 @@ SECTION .text
%macro INC_SRC_BY_SRC_STRIDE 0
%if ARCH_X86=1 && CONFIG_PIC=1
- lea srcq, [srcq + src_stridemp*2]
+ add srcq, src_stridemp
+ add srcq, src_stridemp
%else
lea srcq, [srcq + src_strideq*2]
%endif
%endmacro
-%macro INC_SRC_BY_SRC_2STRIDE 0
-%if ARCH_X86=1 && CONFIG_PIC=1
- lea srcq, [srcq + src_stridemp*4]
-%else
- lea srcq, [srcq + src_strideq*4]
-%endif
-%endmacro
-
%macro SUBPEL_VARIANCE 1-2 0 ; W
%define bilin_filter_m bilin_filter_m_sse2
%define filter_idx_shift 5
@@ -984,8 +977,9 @@ SECTION .text
.x_other_y_other_loop:
movu m2, [srcq]
movu m4, [srcq+2]
- movu m3, [srcq+src_strideq*2]
- movu m5, [srcq+src_strideq*2+2]
+ INC_SRC_BY_SRC_STRIDE
+ movu m3, [srcq]
+ movu m5, [srcq+2]
pmullw m2, filter_x_a
pmullw m4, filter_x_b
paddw m2, filter_rnd
@@ -1018,7 +1012,7 @@ SECTION .text
SUM_SSE m0, m2, m4, m3, m6, m7
mova m0, m5
- INC_SRC_BY_SRC_2STRIDE
+ INC_SRC_BY_SRC_STRIDE
lea dstq, [dstq + dst_strideq * 4]
%if %2 == 1 ; avg
add secq, sec_str
diff --git a/vpx_dsp/x86/highbd_variance_sse2.c b/vpx_dsp/x86/highbd_variance_sse2.c
index b45331c..81ec5db 100644
--- a/vpx_dsp/x86/highbd_variance_sse2.c
+++ b/vpx_dsp/x86/highbd_variance_sse2.c
@@ -243,13 +243,18 @@ unsigned int vpx_highbd_12_mse8x8_sse2(const uint8_t *src8, int src_stride,
}
#if CONFIG_USE_X86INC
+// The 2 unused parameters are place holders for PIC enabled build.
+// These definitions are for functions defined in
+// highbd_subpel_variance_impl_sse2.asm
#define DECL(w, opt) \
int vpx_highbd_sub_pixel_variance##w##xh_##opt(const uint16_t *src, \
ptrdiff_t src_stride, \
int x_offset, int y_offset, \
const uint16_t *dst, \
ptrdiff_t dst_stride, \
- int height, unsigned int *sse);
+ int height, \
+ unsigned int *sse, \
+ void *unused0, void *unused);
#define DECLS(opt1, opt2) \
DECL(8, opt1); \
DECL(16, opt1)
@@ -274,7 +279,7 @@ uint32_t vpx_highbd_8_sub_pixel_variance##w##x##h##_##opt(const uint8_t *src8, \
int se = vpx_highbd_sub_pixel_variance##wf##xh_##opt(src, src_stride, \
x_offset, y_offset, \
dst, dst_stride, h, \
- &sse); \
+ &sse, NULL, NULL); \
if (w > wf) { \
unsigned int sse2; \
int se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt(src + 16, \
@@ -282,19 +287,20 @@ uint32_t vpx_highbd_8_sub_pixel_variance##w##x##h##_##opt(const uint8_t *src8, \
x_offset, y_offset, \
dst + 16, \
dst_stride, \
- h, &sse2); \
+ h, &sse2, \
+ NULL, NULL); \
se += se2; \
sse += sse2; \
if (w > wf * 2) { \
se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt(src + 32, src_stride, \
x_offset, y_offset, \
dst + 32, dst_stride, \
- h, &sse2); \
+ h, &sse2, NULL, NULL); \
se += se2; \
sse += sse2; \
se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt( \
src + 48, src_stride, x_offset, y_offset, \
- dst + 48, dst_stride, h, &sse2); \
+ dst + 48, dst_stride, h, &sse2, NULL, NULL); \
se += se2; \
sse += sse2; \
} \
@@ -312,7 +318,7 @@ uint32_t vpx_highbd_10_sub_pixel_variance##w##x##h##_##opt( \
int se = vpx_highbd_sub_pixel_variance##wf##xh_##opt(src, src_stride, \
x_offset, y_offset, \
dst, dst_stride, \
- h, &sse); \
+ h, &sse, NULL, NULL); \
if (w > wf) { \
uint32_t sse2; \
int se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt(src + 16, \
@@ -320,20 +326,21 @@ uint32_t vpx_highbd_10_sub_pixel_variance##w##x##h##_##opt( \
x_offset, y_offset, \
dst + 16, \
dst_stride, \
- h, &sse2); \
+ h, &sse2, \
+ NULL, NULL); \
se += se2; \
sse += sse2; \
if (w > wf * 2) { \
se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt(src + 32, src_stride, \
x_offset, y_offset, \
dst + 32, dst_stride, \
- h, &sse2); \
+ h, &sse2, NULL, NULL); \
se += se2; \
sse += sse2; \
se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt(src + 48, src_stride, \
x_offset, y_offset, \
dst + 48, dst_stride, \
- h, &sse2); \
+ h, &sse2, NULL, NULL); \
se += se2; \
sse += sse2; \
} \
@@ -359,27 +366,27 @@ uint32_t vpx_highbd_12_sub_pixel_variance##w##x##h##_##opt( \
int se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt( \
src + (start_row * src_stride), src_stride, \
x_offset, y_offset, dst + (start_row * dst_stride), \
- dst_stride, height, &sse2); \
+ dst_stride, height, &sse2, NULL, NULL); \
se += se2; \
long_sse += sse2; \
if (w > wf) { \
se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt( \
src + 16 + (start_row * src_stride), src_stride, \
x_offset, y_offset, dst + 16 + (start_row * dst_stride), \
- dst_stride, height, &sse2); \
+ dst_stride, height, &sse2, NULL, NULL); \
se += se2; \
long_sse += sse2; \
if (w > wf * 2) { \
se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt( \
src + 32 + (start_row * src_stride), src_stride, \
x_offset, y_offset, dst + 32 + (start_row * dst_stride), \
- dst_stride, height, &sse2); \
+ dst_stride, height, &sse2, NULL, NULL); \
se += se2; \
long_sse += sse2; \
se2 = vpx_highbd_sub_pixel_variance##wf##xh_##opt( \
src + 48 + (start_row * src_stride), src_stride, \
x_offset, y_offset, dst + 48 + (start_row * dst_stride), \
- dst_stride, height, &sse2); \
+ dst_stride, height, &sse2, NULL, NULL); \
se += se2; \
long_sse += sse2; \
}\
@@ -410,6 +417,7 @@ FNS(sse2, sse);
#undef FNS
#undef FN
+// The 2 unused parameters are place holders for PIC enabled build.
#define DECL(w, opt) \
int vpx_highbd_sub_pixel_avg_variance##w##xh_##opt(const uint16_t *src, \
ptrdiff_t src_stride, \
@@ -419,7 +427,8 @@ int vpx_highbd_sub_pixel_avg_variance##w##xh_##opt(const uint16_t *src, \
const uint16_t *sec, \
ptrdiff_t sec_stride, \
int height, \
- unsigned int *sse);
+ unsigned int *sse, \
+ void *unused0, void *unused);
#define DECLS(opt1) \
DECL(16, opt1) \
DECL(8, opt1)
@@ -439,23 +448,23 @@ uint32_t vpx_highbd_8_sub_pixel_avg_variance##w##x##h##_##opt( \
uint16_t *sec = CONVERT_TO_SHORTPTR(sec8); \
int se = vpx_highbd_sub_pixel_avg_variance##wf##xh_##opt( \
src, src_stride, x_offset, \
- y_offset, dst, dst_stride, sec, w, h, &sse); \
+ y_offset, dst, dst_stride, sec, w, h, &sse, NULL, NULL); \
if (w > wf) { \
uint32_t sse2; \
int se2 = vpx_highbd_sub_pixel_avg_variance##wf##xh_##opt( \
src + 16, src_stride, x_offset, y_offset, \
- dst + 16, dst_stride, sec + 16, w, h, &sse2); \
+ dst + 16, dst_stride, sec + 16, w, h, &sse2, NULL, NULL); \
se += se2; \
sse += sse2; \
if (w > wf * 2) { \
se2 = vpx_highbd_sub_pixel_avg_variance##wf##xh_##opt( \
src + 32, src_stride, x_offset, y_offset, \
- dst + 32, dst_stride, sec + 32, w, h, &sse2); \
+ dst + 32, dst_stride, sec + 32, w, h, &sse2, NULL, NULL); \
se += se2; \
sse += sse2; \
se2 = vpx_highbd_sub_pixel_avg_variance##wf##xh_##opt( \
src + 48, src_stride, x_offset, y_offset, \
- dst + 48, dst_stride, sec + 48, w, h, &sse2); \
+ dst + 48, dst_stride, sec + 48, w, h, &sse2, NULL, NULL); \
se += se2; \
sse += sse2; \
} \
@@ -475,14 +484,15 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance##w##x##h##_##opt( \
int se = vpx_highbd_sub_pixel_avg_variance##wf##xh_##opt( \
src, src_stride, x_offset, \
y_offset, dst, dst_stride, \
- sec, w, h, &sse); \
+ sec, w, h, &sse, NULL, NULL); \
if (w > wf) { \
uint32_t sse2; \
int se2 = vpx_highbd_sub_pixel_avg_variance##wf##xh_##opt( \
src + 16, src_stride, \
x_offset, y_offset, \
dst + 16, dst_stride, \
- sec + 16, w, h, &sse2); \
+ sec + 16, w, h, &sse2, \
+ NULL, NULL); \
se += se2; \
sse += sse2; \
if (w > wf * 2) { \
@@ -490,14 +500,16 @@ uint32_t vpx_highbd_10_sub_pixel_avg_variance##w##x##h##_##opt( \
src + 32, src_stride, \
x_offset, y_offset, \
dst + 32, dst_stride, \
- sec + 32, w, h, &sse2); \
+ sec + 32, w, h, &sse2, \
+ NULL, NULL); \
se += se2; \
sse += sse2; \
se2 = vpx_highbd_sub_pixel_avg_variance##wf##xh_##opt( \
src + 48, src_stride, \
x_offset, y_offset, \
dst + 48, dst_stride, \
- sec + 48, w, h, &sse2); \
+ sec + 48, w, h, &sse2, \
+ NULL, NULL); \
se += se2; \
sse += sse2; \
} \
@@ -525,7 +537,7 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance##w##x##h##_##opt( \
int se2 = vpx_highbd_sub_pixel_avg_variance##wf##xh_##opt( \
src + (start_row * src_stride), src_stride, x_offset, \
y_offset, dst + (start_row * dst_stride), dst_stride, \
- sec + (start_row * w), w, height, &sse2); \
+ sec + (start_row * w), w, height, &sse2, NULL, NULL); \
se += se2; \
long_sse += sse2; \
if (w > wf) { \
@@ -533,7 +545,7 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance##w##x##h##_##opt( \
src + 16 + (start_row * src_stride), src_stride, \
x_offset, y_offset, \
dst + 16 + (start_row * dst_stride), dst_stride, \
- sec + 16 + (start_row * w), w, height, &sse2); \
+ sec + 16 + (start_row * w), w, height, &sse2, NULL, NULL); \
se += se2; \
long_sse += sse2; \
if (w > wf * 2) { \
@@ -541,14 +553,14 @@ uint32_t vpx_highbd_12_sub_pixel_avg_variance##w##x##h##_##opt( \
src + 32 + (start_row * src_stride), src_stride, \
x_offset, y_offset, \
dst + 32 + (start_row * dst_stride), dst_stride, \
- sec + 32 + (start_row * w), w, height, &sse2); \
+ sec + 32 + (start_row * w), w, height, &sse2, NULL, NULL); \
se += se2; \
long_sse += sse2; \
se2 = vpx_highbd_sub_pixel_avg_variance##wf##xh_##opt( \
src + 48 + (start_row * src_stride), src_stride, \
x_offset, y_offset, \
dst + 48 + (start_row * dst_stride), dst_stride, \
- sec + 48 + (start_row * w), w, height, &sse2); \
+ sec + 48 + (start_row * w), w, height, &sse2, NULL, NULL); \
se += se2; \
long_sse += sse2; \
} \
--
2.7.0
multimedia/video/libvpx/pspec.xml
+13 -1
View File
@@ -13,16 +13,21 @@
<IsA>library</IsA>
<Summary>WebM VP8 Codec SDK</Summary>
<Description>libvpx is the VP8 development library usually used in WebM and similiar formats.</Description>
<Archive sha1sum="d05f4e9a9878886282ac9c9246f8fac080c94c8f" type="tarbz2">http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.4.0.tar.bz2</Archive>
<Archive sha1sum="82426a59ad34d72c762f9e4079e8e5197afc842d" type="targz">https://github.com/webmproject/libvpx/archive/v1.5.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>libgcc</Dependency>
<Dependency>yasm-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">0001-Fix-for-issue-1114-compile-error.patch</Patch>
</Patches>
</Source>
<Package>
<Name>libvpx</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
@@ -43,6 +48,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-06-12</Date>
<Version>1.5.0</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>1.4.0</Version>
multimedia/video/x264/pspec.xml
+14 -1
View File
@@ -14,14 +14,20 @@
<Summary>Open source H264/AVC encoder</Summary>
<Description>x264 is a free library for encoding H264/AVC video streams.</Description>
<!-- Archives come from http://download.videolan.org/pub/videolan/x264/snapshots/ -->
<Archive sha1sum="4c1ef4fdaf22a40f23dc6dafb0eda6b45b0c4ba0" type="tarbz2">ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20141201-2245.tar.bz2</Archive>
<Archive sha1sum="1a8d219c1eab9df5ef04b1f6bcc5e4a9795a50fd" type="tarbz2">ftp://ftp.videolan.org/pub/x264/snapshots/last_x264.tar.bz2</Archive>
<BuildDependencies>
<Dependency>yasm-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
<Dependency>l-smash-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>x264</Name>
<RuntimeDependencies>
<Dependency>ffmpeg</Dependency>
<Dependency>l-smash</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
@@ -41,6 +47,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-06-12</Date>
<Version>2245.11062016</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>2245</Version>
multimedia/video/x265/actions.py
+5 -8
View File
@@ -10,18 +10,15 @@ from pisi.actionsapi import cmaketools
from pisi.actionsapi import shelltools
def setup():
pisitools.ldflags.add("-z,noexecstack")
shelltools.cd("build/linux")
cmaketools.configure("-DCMAKE_BUILD_TYPE=release", sourceDir="../../source")
shelltools.cd("source")
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
-DENABLE_STATIC=OFF")
def build():
shelltools.cd("build/linux")
shelltools.cd("source")
cmaketools.make()
def install():
shelltools.cd("build/linux")
shelltools.cd("source")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.remove("/usr/lib/libx265.a")
multimedia/video/x265/files/x265-1.9-enable_static-1.patch
+76
View File
@@ -0,0 +1,76 @@
Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
Date: 2015-10-24
Initial Package Version: 1.8
Upstream Status: not submitted
Origin: https://bitbucket.org/TimothyGu/x265/commits/a9aacc5a16116f1c663d1fcb62ad9a0985043b94/raw/
https://bitbucket.org/TimothyGu/x265/commits/578c5ef3dff46db38e7c36a8d3c6198a65c9746b/raw/
Description: Add ENABLE_STATIC:BOOL=ON, so that static lib
can be disabled.
--- x265_11047/source/CMakeLists.txt.orig 2015-10-08 07:01:36.000000000 -0300
+++ x265_11047/source/CMakeLists.txt 2015-10-24 17:10:57.919861668 -0300
@@ -419,16 +419,21 @@
endif()
source_group(ASM FILES ${YASM_SRCS})
-add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})
-if(NOT MSVC)
- set_target_properties(x265-static PROPERTIES OUTPUT_NAME x265)
-endif()
-if(EXTRA_LIB)
- target_link_libraries(x265-static ${EXTRA_LIB})
-endif()
-install(TARGETS x265-static
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+
+option(ENABLE_STATIC "Build static library" ON)
+if(ENABLE_STATIC)
+ add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})
+ if(NOT MSVC)
+ set_target_properties(x265-static PROPERTIES OUTPUT_NAME x265)
+ endif()
+ if(EXTRA_LIB)
+ target_link_libraries(x265-static ${EXTRA_LIB})
+ endif()
+ install(TARGETS x265-static
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+endif(ENABLE_STATIC)
+
install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
if(CMAKE_RC_COMPILER)
@@ -490,6 +495,10 @@
endif()
endif()
+if(NOT ENABLE_STATIC AND NOT ENABLE_SHARED)
+ message(FATAL_ERROR "Neither static nor shared libraries are enabled.")
+endif()
+
if(X265_LATEST_TAG)
# convert lists of link libraries into -lstdc++ -lm etc..
foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
@@ -551,12 +560,14 @@
else()
add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${GETOPT} ${X265_RC_FILE}
${ExportDefs} x265.cpp x265.h x265cli.h x265-extras.h x265-extras.cpp)
- if(WIN32 OR NOT ENABLE_SHARED OR INTEL_CXX)
- # The CLI cannot link to the shared library on Windows, it
- # requires internal APIs not exported from the DLL
- target_link_libraries(cli x265-static ${PLATFORM_LIBS})
- else()
+ if(WIN32 AND NOT ENABLE_STATIC)
+ message(FATAL_ERROR "The CLI cannot link to shared library on Windows as it requires internal APIs not exported from the DLL.")
+ elseif(INTEL_CXX AND NOT ENABLE_STATIC)
+ message(FATAL_ERROR "The CLI cannot link to shared library with Intel C++ Compiler as it requires internal APIs not exported from the shared library.")
+ elseif(ENABLE_SHARED)
target_link_libraries(cli x265-shared ${PLATFORM_LIBS})
+ else()
+ target_link_libraries(cli x265-static ${PLATFORM_LIBS})
endif()
endif()
set_target_properties(cli PROPERTIES OUTPUT_NAME x265)
multimedia/video/x265/pspec.xml
+11 -1
View File
@@ -13,11 +13,14 @@
<IsA>app:console</IsA>
<Summary>Open source H265/EVC encoder</Summary>
<Description>x265 is a commercially funded open source implementation of the H.265/High Efficiency Video Coding (HEVC) compression standard.</Description>
<Archive sha1sum="7eee170b6adeb7c3012d3a165afb6a0fd1f02646" type="tarbz2">https://bitbucket.org/multicoreware/x265/get/1.7.tar.bz2</Archive>
<Archive sha1sum="8c9aa3b87b0f0a418bbb9782e9354d112d75e003" type="targz">https://bitbucket.org/multicoreware/x265/downloads/x265_1.9.tar.gz</Archive>
<BuildDependencies>
<Dependency>yasm-devel</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">x265-1.9-enable_static-1.patch</Patch>
</Patches>
</Source>
<Package>
@@ -44,6 +47,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-06-12</Date>
<Version>1.9</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>1.7</Version>
pisi-index.xml
+85301 -85086
View File
File diff suppressed because it is too large Load Diff
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
8e98df19b3476ac048c10e260cd200cac054c432
074668b92ca488af11c559261cf1628866ebba06
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
1f091179556fcb3c1a524bf17a77c9e8dcd7af3c
c73db7a043d00aaec9f2c55c2c1cc8b2ffc03b18