Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
Safa Arıman
2021-04-23 17:59:25 +03:00
9 changed files with 115 additions and 43 deletions
+9 -28
View File
@@ -1,38 +1,19 @@
#!/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
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import shelltools
from pisi.actionsapi import mesontools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
shelltools.export('HOME', get.workDIR())
def setup():
autotools.configure("--prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-pdf \
--enable-tiff \
--enable-djvu \
--enable-dvi \
--enable-t1lib \
--disable-nautilus \
--enable-comics \
--disable-scrollkeeper \
--disable-schemas-compile \
--enable-introspection")
#--enable-nautilus \
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
mesontools.configure("-Dnautilus=false")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
mesontools.build()
pisitools.dodoc("AUTHORS", "ChangeLog", "README", "COPYING", "TODO")
def install():
mesontools.install()
pisitools.dodoc("AUTHORS", "NEWS*", "README*", "COPYING", "TODO")
+11 -1
View File
@@ -13,9 +13,11 @@
<IsA>app:gui</IsA>
<Summary>A document viewer, built without GConf and GNOME keyring support</Summary>
<Description>Evince is a document viewer for multiple document formats. The goal of evince is to replace the multiple document viewers that exist on the GNOME Desktop with a single simple application.</Description>
<Archive sha1sum="cc1500688127de6086fe11f2b81b8837c8ea5a8f" type="tarxz">mirrors://gnome/evince/3.26/evince-3.26.0.tar.xz</Archive>
<Archive sha1sum="6fb18866c19aaa3ffb727ef656a2b1941ded17fa" type="tarxz">mirrors://gnome/evince/3.38/evince-3.38.2.tar.xz</Archive>
<BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>itstool</Dependency>
<Dependency>gtk-doc</Dependency>
<Dependency>atk-devel</Dependency>
<Dependency>libgxps-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
@@ -31,6 +33,7 @@
<Dependency>poppler-glib-devel</Dependency>
<Dependency>intltool</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
</BuildDependencies>
</Source>
@@ -99,6 +102,13 @@
</Package>
<History>
<Update release="5">
<Date>2021-04-23</Date>
<Version>3.38.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-08-09</Date>
<Version>3.26.0</Version>
+20 -9
View File
@@ -5157,7 +5157,7 @@
<License>BSD</License>
<IsA>library</IsA>
<IsA>app:console</IsA>
<PartOf>harware.misc</PartOf>
<PartOf>hardware.misc</PartOf>
<Summary xml:lang="en">Portable Hardware Locality (hwloc)</Summary>
<Summary xml:lang="tr">Hiyerarşik mimarilerin taşınabilir soyutlama kitaplığı</Summary>
<Description xml:lang="en">The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs.</Description>
@@ -166914,7 +166914,7 @@ functionality to build high-performing, platform-independent programs.</Descript
</Packager>
<License>GPLv3</License>
<IsA>app:gui</IsA>
<PartOf>kernel.default.drivers</PartOf>
<PartOf>kernel.drivers</PartOf>
<Summary xml:lang="en">a project aiming to support NVIDIA Optimus technology under Linux.</Summary>
<Description xml:lang="en">The Bumblebee Project proudly presents version 3.0 of Bumblebee, a project aiming to support NVIDIA Optimus technology under Linux. After two months of hard work this version has finally been considered stable enough for release.</Description>
<Archive type="targz" sha1sum="a715f4aa1b0c24dd4352ff7e0bc390f1e4e03cd9" name="bumblebee-3.2.1.tar.gz">http://www.bumblebee-project.org/bumblebee-3.2.1.tar.gz</Archive>
@@ -193926,7 +193926,7 @@ functionality to build high-performing, platform-independent programs.</Descript
</Packager>
<License>GPLv3</License>
<IsA>library</IsA>
<PartOf>util.misc.patchutils</PartOf>
<PartOf>util.misc</PartOf>
<Summary xml:lang="en">A small collection of programs that operate on patch files</Summary>
<Summary xml:lang="tr">A small collection of programs that operate on patch files</Summary>
<Description xml:lang="en">Yama dosyalarında çalışan küçük bir program koleksiyonu</Description>
@@ -193937,7 +193937,7 @@ functionality to build high-performing, platform-independent programs.</Descript
<Dependency>python3-devel</Dependency>
<Dependency>libpcre2-devel</Dependency>
</BuildDependencies>
<SourceURI>util/misc/patchutils/patchutils/pspec.xml</SourceURI>
<SourceURI>util/misc/patchutils/pspec.xml</SourceURI>
</Source>
<Package>
<Name>patchutils</Name>
@@ -204400,7 +204400,7 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
<License>BSD</License>
<IsA>library</IsA>
<IsA>app:console</IsA>
<PartOf>multimedia.mısc</PartOf>
<PartOf>multimedia.misc</PartOf>
<Summary xml:lang="fr">Une librairie rapide pour créer des graphiques en images.</Summary>
<Summary xml:lang="en">A fast library for creating graphic images</Summary>
<Summary xml:lang="tr">Hızlı bir şekilde resim oluşturmak için bir kütüphane</Summary>
@@ -239456,7 +239456,7 @@ contacts, tasks, and calendar information.</Summary>
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<PartOf>programming.language.misc</PartOf>
<PartOf>programming.misc</PartOf>
<Summary xml:lang="en">Desktop notification library</Summary>
<Summary xml:lang="tr">Masaüstü bildirim kitaplığı</Summary>
<Description xml:lang="fr">Envoie les notifications bureautiques à un daemon de notification.</Description>
@@ -277384,7 +277384,7 @@ to create header files and sources from protocol files.</Description>
</Packager>
<License>Apache-2</License>
<IsA>library</IsA>
<PartOf>programming.library.libdispatch</PartOf>
<PartOf>programming.library</PartOf>
<Summary xml:lang="en">Grand Central Dispatch.</Summary>
<Description xml:lang="en">Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware.</Description>
<Archive type="targz" sha1sum="f25bc698285cfa84bf24bd8bd5ef9103c4668e0a" name="swift-5.3-RELEASE.tar.gz">https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE.tar.gz</Archive>
@@ -277397,7 +277397,7 @@ to create header files and sources from protocol files.</Description>
<Patch level="0">avoid-libkqueue.patch</Patch>
<Patch level="0">remove-werror.patch</Patch>
</Patches>
<SourceURI>programming/library/libdispatch/libdispatch/pspec.xml</SourceURI>
<SourceURI>programming/library/libdispatch/pspec.xml</SourceURI>
</Source>
<Package>
<Name>libdispatch</Name>
@@ -282734,7 +282734,7 @@ to create header files and sources from protocol files.</Description>
</Packager>
<License>GPLv2</License>
<IsA>app:gui</IsA>
<PartOf>gnome.addons</PartOf>
<PartOf>desktop.gnome.addons</PartOf>
<Summary xml:lang="en">A document viewer, built without GConf and GNOME keyring support</Summary>
<Summary xml:lang="tr">Hafif ve özgür bir PDF görüntüleyici</Summary>
<Description xml:lang="en">Evince is a document viewer for multiple document formats. The goal of evince is to replace the multiple document viewers that exist on the GNOME Desktop with a single simple application.</Description>
@@ -290822,6 +290822,17 @@ to create header files and sources from protocol files.</Description>
<Email>admins@pisilinux.org</Email>
</Maintainer>
</Component>
<Component>
<Name>util.dock</Name>
<LocalName xml:lang="en">FIXME</LocalName>
<Summary xml:lang="en">FIXME</Summary>
<Description xml:lang="en">FIXME</Description>
<Group>accessories</Group>
<Maintainer>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Maintainer>
</Component>
<Component>
<Name>util.antivirus</Name>
<LocalName xml:lang="en">FIXME</LocalName>
+1 -1
View File
@@ -1 +1 @@
22d3eba6ea0b5280c80745bdd333e9875920a571
8c603aca23a5660cf04bcfcccad200614d8510bc
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
5eaba3945646540901df381f5a10f59cca48cb11
9b3176bd31ec39aaabd25dd5630f9c558797d262
+1
View File
@@ -9,6 +9,7 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
def setup():
autotools.autoreconf("-fiv")
autotools.configure("\
CONF_DRIVER=nvidia \
CONF_DRIVER_MODULE_NVIDIA=nvidia \
@@ -0,0 +1,66 @@
Author: Andreas Beckmann <anbe@debian.org>
Description: fix FTBFS with gcc-10
gcc-10 defaults to -fno-common
see https://gcc.gnu.org/gcc-10/porting_to.html
Bug-Debian: https://bugs.debian.org/957058
--- a/src/bbconfig.h
+++ b/src/bbconfig.h
@@ -103,7 +103,7 @@ enum bb_pm_method {
PM_VGASWITCHEROO,
PM_METHODS_COUNT /* not a method but a marker for the end */
};
-const char *bb_pm_method_string[PM_METHODS_COUNT];
+extern const char *bb_pm_method_string[PM_METHODS_COUNT];
/* String buffer size */
#define BUFFER_SIZE 1024
--- a/src/switch/switching.h
+++ b/src/switch/switching.h
@@ -60,10 +60,10 @@ void switcheroo_off(void);
/* number of switchers as defined in switching.c */
#define SWITCHERS_COUNT 2
-struct switching_method switching_methods[SWITCHERS_COUNT];
+extern struct switching_method switching_methods[SWITCHERS_COUNT];
/* A switching method that can be used or NULL if none */
-struct switching_method *switcher;
+extern struct switching_method *switcher;
struct switching_method *switcher_detect(const char *name, struct switch_info);
enum switch_state switch_status(void);
--- a/src/bbsecondary.h
+++ b/src/bbsecondary.h
@@ -21,7 +21,7 @@
#pragma once
/* PCI Bus ID of the discrete video card */
-struct pci_bus_id *pci_bus_id_discrete;
+extern struct pci_bus_id *pci_bus_id_discrete;
/// Start the X server by fork-exec, turn card on if needed.
bool start_secondary(bool);
--- a/src/switch/switching.c
+++ b/src/switch/switching.c
@@ -31,6 +31,8 @@ struct switching_method switching_method
switcheroo_on, switcheroo_off}
};
+struct switching_method *switcher = NULL;
+
/**
* Enumerates through available switching methods and try a method
*
--- a/src/bbsecondary.c
+++ b/src/bbsecondary.c
@@ -37,6 +37,9 @@
#include "pci.h"
#include "module.h"
+/* PCI Bus ID of the discrete video card */
+struct pci_bus_id *pci_bus_id_discrete;
+
/**
* Substitutes DRIVER in the passed path
* @param x_conf_file A path to be processed
+6 -3
View File
@@ -11,15 +11,17 @@
<IsA>app:gui</IsA>
<Summary>a project aiming to support NVIDIA Optimus technology under Linux.</Summary>
<Description>The Bumblebee Project proudly presents version 3.0 of Bumblebee, a project aiming to support NVIDIA Optimus technology under Linux. After two months of hard work this version has finally been considered stable enough for release.</Description>
<Archive sha1sum="a715f4aa1b0c24dd4352ff7e0bc390f1e4e03cd9" type="targz">http://www.bumblebee-project.org/bumblebee-3.2.1.tar.gz</Archive>
<!-- <Archive sha1sum="a715f4aa1b0c24dd4352ff7e0bc390f1e4e03cd9" type="targz">http://www.bumblebee-project.org/bumblebee-3.2.1.tar.gz</Archive> -->
<Archive sha1sum="e98a979750fcefa1ae2217d5baaf92af895dcc91" type="targz" name="bumblebee-3.2.1.tar.gz">https://github.com/Bumblebee-Project/Bumblebee/archive/8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec.tar.gz</Archive>
<BuildDependencies>
<Dependency>libbsd-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libkmod-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">bb-hexadecimal.patch</Patch>
<Patch level="1">nv-uvm-modeset.patch</Patch>
<!-- <Patch level="1">bb-hexadecimal.patch</Patch> -->
<!-- <Patch level="1">nv-uvm-modeset.patch</Patch> -->
</Patches>
</Source>
<Package>
@@ -31,6 +33,7 @@
<Dependency>libbsd</Dependency>
<Dependency>primus</Dependency>
<Dependency>virtualgl</Dependency>
<Dependency>libkmod</Dependency>
<Dependency>virtualgl-32bit</Dependency>
</RuntimeDependencies>
<Files>