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

Merge branch 'master' into docker_1_11_2

Browse Source
This commit is contained in:
Ertuğrul Erata
2016-07-23 22:58:14 +03:00
parent 1a27e9a8cd 002b68386c
commit 5e30f2ff7e
64 changed files with 92815 additions and 87149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/plasma/sddm/files/10-backlight.rules → desktop/kde/plasma/sddm/files/10-backlight.rules
View File
desktop/kde/plasma/sddm/pspec.xml
+2 -2
View File
@@ -63,9 +63,9 @@
<History>
<Update release="2">
<Date>2016-06-03</Date>
<Date>2016-07-15</Date>
<Version>0.13.0</Version>
<Comment>Fix session authorization issue.</Comment>
<Comment>Fix session authorization issue and add rules</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
desktop/pisilinux/kaptan/pspec.xml
+17 -10
View File
@@ -5,18 +5,18 @@
<Name>kaptan</Name>
<Homepage>http://pisilinux.org</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
<Name>Metehan Özbek</Name>
<Email>mthnzbk@gmail.com</Email>
</Packager>
<License>GPLv2</License>
<License>GPLv3</License>
<Icon>kaptan</Icon>
<IsA>app:gui</IsA>
<Summary>Kaptan, Pisi Linux workspace configuration wizard</Summary>
<Description>Kaptan lets you configure your workspace on first login.</Description>
<Archive sha1sum="924eda1e9aade102ed93c78d19ba362191b12bc1" type="targz">https://github.com/PisiLinuxNew/kaptan/archive/5.0-beta3.tar.gz</Archive>
<Archive sha1sum="f0a1849ed9fc0dc4b9e97575e7ae3f17350cb466" type="targz">https://github.com/PisiLinuxNew/kaptan/archive/beta5.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-setuptools</Dependency>
<Dependency>python3-qt5-devel</Dependency>
<Dependency>python3-qt5</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>qt5-linguist</Dependency>
</BuildDependencies>
@@ -29,7 +29,7 @@
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/lib/kaptan</Path>
<Path fileType="data">/usr/share/kaptan</Path>
<Path fileType="data">/usr/lib/python3.4/site-packages</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/icons</Path>
@@ -40,6 +40,13 @@
</Package>
<History>
<Update release="5">
<Date>2016-07-20</Date>
<Version>5.1.2</Version>
<Comment>Release Bump</Comment>
<Name>Metehan Özbek</Name>
<Email>mthnzbk@gmail.com</Email>
</Update>
<Update release="4">
<Date>2016-06-09</Date>
<Version>5.1.1</Version>
@@ -62,11 +69,11 @@
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-05-08</Date>
<Date>2016-05-17</Date>
<Version>5.0</Version>
<Comment>First release</Comment>
<Name>Metehan Özbek</Name>
<Email>admins@pisilinux.org</Email>
<Comment>version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
</History>
</PISI>
desktop/pisilinux/pisiplayer/actions.py
+13
View File
@@ -0,0 +1,13 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
import glob
def install():
pythonmodules.install(pyVer = "3")
desktop/pisilinux/pisiplayer/pspec.xml
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>pisiplayer</Name>
<Homepage>http://pisilinux.org</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv3</License>
<Icon>pisiplayer</Icon>
<IsA>app:gui</IsA>
<Summary>Video Player</Summary>
<Description>Video Player for Pisi Linux</Description>
<Archive sha1sum="cbd2ea4b1c3377a19cd98fed77c1cf0826d34a86" type="targz">https://github.com/mthnzbk/pisi-player/archive/0.9.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-setuptools</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>python3-qt5</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>pisiplayer</Name>
<RuntimeDependencies>
<Dependency>python3-qt5</Dependency>
<Dependency>python3-sip</Dependency>
<Dependency>python3-youtube_dl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/lib/pisiplayer</Path>
<Path fileType="data">/usr/lib/python3.4/site-packages</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/icons</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-07-04</Date>
<Version>0.9</Version>
<Comment>First release</Comment>
<Name>Metehan Özbek</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
desktop/pisilinux/pisiplayer/translations.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>kaptan</Name>
<Summary xml:lang="tr">Pisi Linux için Video Player</Summary>
<Description xml:lang="tr">Pisi Linux için geliştirilen PyQt5 tabanlı video oynatıcısı</Description>
</Source>
</PISI>
hardware/emulator/wine/actions.py
+10 -7
View File
@@ -8,6 +8,8 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
WorkDir = "wine-%s" % get.srcVERSION()
def setup():
shelltools.system("install=wine.keyring")
# For 32bit machines:
@@ -22,21 +24,22 @@ def setup():
# to the 64bit files that was compiled in the first step (files in the work)
#
# More info can be obtained here: http://wiki.winehq.org/Wine64
# shelltools.export("CPPFLAGS", "-D_FORTIFY_SOURCE=2 -D_FORTIFY_SOURCE=0")
#shelltools.export("CPPFLAGS", "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0")
#shelltools.system("make -C ./wine-staging-%s/patches DESTDIR=$(pwd) install" %get.srcVERSION())
pisitools.flags.add("-fno-omit-frame-pointer")
#pisitools.flags.add("-fno-omit-frame-pointer")
#shelltools.system("sed -i 's|OpenCL/opencl.h|CL/opencl.h|g' configure*")
autotools.autoreconf("-vif")
options = "--without-capi \
--with-curses \
--without-hal \
--without-oss \
--without-opencl \
--without-gstreamer \
--without-hal \
--with-dbus \
--with-opengl \
--with-alsa \
--with-x \
--with-xattr \
--prefix=/usr"
"
if get.buildTYPE() == "emul32":
shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
hardware/emulator/wine/pspec.xml
+28 -6
View File
@@ -8,12 +8,11 @@
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<ExcludeArch>i686</ExcludeArch>
<License>LGPLv2.1</License>
<IsA>app:console</IsA>
<Summary>WINE Is Not An Emulator, which lets you run Microsoft Windows applications</Summary>
<Description>Wine allows running Windows 3.*, Windows 95/98 and Windows NT programs on a i386 (or compatible) machine running X11. It is still alpha level code; don't expect everything to work.</Description>
<Archive sha1sum="157efa125c047ac5a2f64f5ef2d26e9592645f82" type="tarbz2">https://dl.winehq.org/wine/source/1.9/wine-1.9.13.tar.bz2</Archive>
<Archive sha1sum="5018834f4f6aeca3870ba6db64e51a0c4c7d5635" type="tarbz2">https://dl.winehq.org/wine/source/1.9/wine-1.9.15.tar.bz2</Archive>
<BuildDependencies>
<Dependency>lcms2-devel</Dependency>
<Dependency>libao-devel</Dependency>
@@ -69,10 +68,6 @@
<Patch level="1">wine-1.9.3-gcc-5_3_0-disable-force-alignment.patch</Patch>
<Patch level="1">gcc_erorr.patch</Patch>
<!-- Use XDG_DOCUMENTS_DIR for "My Documents" -->
<!--Patch level="1">documents-path.patch</Patch>
<Patch level="1">application-pdf.patch</Patch>
<Patch level="1">desktop-file-translation.patch</Patch>
<Patch level="1">fix_rm.patch</Patch-->
</Patches>
</Source>
@@ -263,6 +258,33 @@
</Package>
<History>
<Update release="5">
<Date>2016-07-23</Date>
<Version>1.9.15</Version>
<Comment>Bugs fixed in 1.9.15 (total 22).</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2016-07-11</Date>
<Version>1.9.14</Version>
<Comment>
-Pisilinux Fixed Options.
-More Shader Model 5 support in Direct3D.
-Some more write support in WebServices.
-Performance improvements in GDI.
-Some more progress towards the Direct3D command stream.
-Various bug fixes.</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-07-11</Date>
<Version>1.9.14</Version>
<Comment>Version bump</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-07-09</Date>
<Version>1.9.13</Version>
hardware/virtualization/virtualbox/actions.py
+3 -3
View File
@@ -15,8 +15,8 @@ VBoxDataDir = "/usr/share/virtualbox"
KDIR = kerneltools.getKernelVersion()
def setup():
#pisitools.dosed("LocalConfig.kmk", "__VBOXLIBDIR__", VBoxLibDir)
#pisitools.dosed("LocalConfig.kmk", "__VBOXDATADIR__", VBoxDataDir)
pisitools.dosed("LocalConfig.kmk", "__VBOXLIBDIR__", VBoxLibDir)
pisitools.dosed("LocalConfig.kmk", "__VBOXDATADIR__", VBoxDataDir)
shelltools.echo("vbox.cfg", "INSTALL_DIR=%s" % VBoxLibDir)
@@ -94,7 +94,7 @@ def install():
pisitools.dolib("additions/VBoxOGL*")
pisitools.dosym("../../../VBoxOGL.so", "/usr/lib/xorg/modules/dri/vboxvideo_dri.so")
pisitools.insinto("/usr/lib/xorg/modules/drivers", "additions/vboxvideo_drv_%s.so" % XorgVersion, "vboxvideo_drv.so")
pisitools.insinto("/usr/lib/xorg/modules/drivers", "additions/vboxvideo_drv_system.so", "vboxvideo.so")
#pisitools.insinto("/usr/lib/xorg/modules/input", "additions/vboxmouse_drv_%s.so" % XorgVersion, "vboxmouse_drv.so")
# Python bindings
hardware/virtualization/virtualbox/comar/package.py
+2 -1
View File
@@ -10,4 +10,5 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
for _file in files:
f = "/usr/lib/virtualbox/%s" % _file
os.system("/bin/chown :%s %s" % (vboxgroup, f))
os.chmod(f, 04510)
os.chmod(f, 04755)
hardware/virtualization/virtualbox/comar/service.py
+32
View File
@@ -0,0 +1,32 @@
from comar.service import *
import os
serviceType = "script"
serviceDefault = "on"
serviceDesc = _({"en": "VirtualBox",
"tr": "VirtualBox"})
serviceConf = "virtualbox"
PIDFILE = "/run/virtualbox.pid"
@synchronized
def start():
os.system("/sbin/modprobe vboxguest")
os.system("/sbin/modprobe vboxvideo")
os.system("/sbin/modprobe vboxsf")
os.system("/sbin/modprobe vboxdrv")
@synchronized
def reload():
if os.path.exists(PIDFILE):
os.kill(int(open(PIDFILE, "r").read().strip()), 1)
@synchronized
def stop():
stopService(pidfile=PIDFILE, donotify=True)
if os.path.isfile(PIDFILE): os.unlink(PIDFILE)
def status():
return isServiceRunning(pidfile=PIDFILE)
hardware/virtualization/virtualbox/files/003-ogl-include-path.patch
+20 -3
View File
@@ -1,6 +1,8 @@
--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000
+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000
@@ -63,18 +63,12 @@
Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
===================================================================
--- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
+++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
@@ -67,18 +67,12 @@
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
@@ -24,3 +26,18 @@
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
@@ -213,10 +207,10 @@
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_LIBS += \
- $(PATH_STAGE_LIB)/libXcomposite.so \
- $(PATH_STAGE_LIB)/libXdamage.so \
- $(PATH_STAGE_LIB)/libXfixes.so \
- $(PATH_STAGE_LIB)/libXext.so
+ Xcomposite \
+ Xdamage \
+ Xfixes \
+ Xext
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
VBoxOGL_LIBS += \
hardware/virtualization/virtualbox/files/LocalConfig.kmk
+15 -8
View File
@@ -1,9 +1,9 @@
VBOX_WITH_ADDITION_DRIVERS =
VBOX_WITH_INSTALLER = 1
VBOX_WITH_LINUX_ADDITIONS = 1
VBOX_WITH_X11_ADDITIONS = 1
VBOX_WITH_TESTCASES =
VBOX_WITH_TESTSUITE =
# do not build test cases
VBOX_WITH_TESTCASES :=
VBOX_WITH_TESTSUITE :=
VBOX_WITH_VALIDATIONKIT :=
# PisiLinux path
VBOX_WITH_ORIGIN :=
VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
@@ -11,11 +11,18 @@ VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
VBOX_WITH_REGISTRATION_REQUEST =
VBOX_WITH_UPDATE_REQUEST =
VBOX_BLD_PYTHON = python
VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
# do not fail on warning
VBOX_GCC_WERR =
VBOX_GCC_WARN =
# fix gsoap missing zlib include and produce errors with --as-needed
VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
# use system xorg
VBOX_USE_SYSTEM_XORG_HEADERS = 1
# no update request. update are handled via pisi
VBOX_WITH_UPDATE_REQUEST := 0
hardware/virtualization/virtualbox/files/LocalConfig2.kmk
+21
View File
@@ -0,0 +1,21 @@
VBOX_WITH_ADDITION_DRIVERS =
VBOX_WITH_INSTALLER = 1
VBOX_WITH_LINUX_ADDITIONS = 1
VBOX_WITH_X11_ADDITIONS = 1
VBOX_WITH_TESTCASES =
VBOX_WITH_TESTSUITE =
VBOX_WITH_ORIGIN :=
VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
VBOX_WITH_REGISTRATION_REQUEST =
VBOX_WITH_UPDATE_REQUEST =
VBOX_BLD_PYTHON = python
VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
VBOX_GCC_WERR =
VBOX_GCC_WARN =
# fix gsoap missing zlib include and produce errors with --as-needed
VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
hardware/virtualization/virtualbox/files/python.patch
+9
View File
@@ -0,0 +1,9 @@
# 2013 © Sébastien Luttringer
--- a/src/VBox/Frontends/VBoxShell/vboxshell.py 2014-01-03 01:38:41.831615590 +0100
+++ b/src/VBox/Frontends/VBoxShell/vboxshell.py 2014-01-04 04:23:33.884544420 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# -*- coding: utf-8 -*-
# $Id: vboxshell.py 49841 2013-12-09 13:32:33Z vboxsync $
"""
hardware/virtualization/virtualbox/files/vboxreload
+4 -7
View File
@@ -1,8 +1,8 @@
#!/bin/bash
# vboxreload: shortcut to reload virtualbox modules with DKMS support
# vboxreload: shortcut to reload virtualbox host modules
#
# Copyright © 2013 Sébastien Luttringer
# Copyright © 2016 Sébastien Luttringer
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -18,6 +18,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
(( UID > 0 )) && { echo 'You must be root' >&2; exit 1; }
modules=(vboxnetadp vboxnetflt vboxpci vboxdrv)
echo -n 'Unloading modules: '
@@ -26,11 +28,6 @@ for _m in "${modules[@]}"; do
done
echo
if type -P dkms >/dev/null; then
echo 'DKMS autoinstall'
dkms autoinstall
fi
echo -n 'Loading modules: '
for _m in "${modules[@]}"; do
modprobe "$_m" && echo -n "$_m "
hardware/virtualization/virtualbox/pspec.xml
+19 -2
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>A powerful virtualization program</Summary>
<Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
<Archive sha1sum="8e7fa9bb7ab16854418c7878b61cc10dc5cc6a77" type="tarbz2">http://download.virtualbox.org/virtualbox/5.1.0_BETA2/VirtualBox-5.1.0_BETA2.tar.bz2</Archive>
<Archive sha1sum="dba4db3933b9fc8d5632a8c86bd6a7747d891ed9" type="tarbz2">http://download.virtualbox.org/virtualbox/5.1.2/VirtualBox-5.1.2.tar.bz2</Archive>
<BuildDependencies>
<Dependency>dev86</Dependency>
<Dependency>cdrkit</Dependency>
@@ -42,9 +42,10 @@
<Dependency>libvncserver-devel</Dependency>
<Dependency>libXcomposite-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>jdk7-openjdk</Dependency>
<Dependency>kernel-module-headers</Dependency>
<Dependency>qt5-x11extras-devel</Dependency>
<Dependency>jdk7-openjdk</Dependency>
<Dependency>jre7-openjdk</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-linguist</Dependency>
@@ -58,6 +59,7 @@
<Patch level="1">003-ogl-include-path.patch</Patch>
<Patch level="1">008-root-window.patch</Patch>
<Patch level="1">004-xorg.patch</Patch>
<Patch level="1">python.patch</Patch>
</Patches>
</Source>
@@ -102,6 +104,7 @@
</Files>
<Provides>
<COMAR script="package.py">System.Package</COMAR>
<COMAR script="service.py">System.Service</COMAR>
</Provides>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/bin/vboxreload">vboxreload</AdditionalFile>
@@ -144,6 +147,20 @@
</Package>
<History>
<Update release="5">
<Date>2016-07-22</Date>
<Version>5.1.2</Version>
<Comment>Version Bump</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2016-07-17</Date>
<Version>5.1.0</Version>
<Comment>Version Bump</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-06-17</Date>
<Version>5.1.0b</Version>
kernel/drivers/module-nvidia-current/actions.py
+2 -2
View File
@@ -152,8 +152,8 @@ def install():
pisitools.dolib("libnvidia-fatbinaryloader.so.%s" % version, libdir)
pisitools.insinto("/usr/share/X11/xorg.conf.d", "nvidia-drm-outputclass.conf")
pisitools.insinto("/usr/share/nvidia", "nvidia-application-profiles-361.28-rc")
pisitools.insinto("/usr/share/nvidia", "nvidia-application-profiles-361.28-key-documentation")
pisitools.insinto("/usr/share/nvidia", "nvidia-application-profiles-367.27-rc")
pisitools.insinto("/usr/share/nvidia", "nvidia-application-profiles-367.27-key-documentation")
pisitools.insinto("/usr/share/pixmaps", "nvidia-settings.png")
pisitools.dolib("libnvidia-gtk2.so.%s" % version, libdir)
kernel/drivers/module-nvidia-current/pspec.xml
+13 -8
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
@@ -12,10 +11,10 @@
<License>NVIDIA</License>
<Summary>NVIDIA drivers for GeForce 6xxx and newer GPUs</Summary>
<Description>NVIDIA graphics drivers provide optimized 2D/3D performance.</Description>
<Archive sha1sum="aa7057262cf34d53c87e2caf231301d5a499b13b" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86/361.28/NVIDIA-Linux-x86-361.28.run</Archive>
<Archive sha1sum="b2cd218732d0a1eae1f290b1c38138f1080eb39c" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86_64/361.28/NVIDIA-Linux-x86_64-361.28.run</Archive>
<Archive sha1sum="26fbf11adad7d3f87df6705ec8cf223d5ab6ba2a" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86/367.27/NVIDIA-Linux-x86-367.27.run</Archive>
+ <Archive sha1sum="845160564bc6b5587bb86cf5244a35969c1ef923" type="binary">ftp://download.nvidia.com/XFree86/Linux-x86_64/367.27/NVIDIA-Linux-x86_64-367.27.run</Archive>
<BuildDependencies>
<Dependency version="4.4.8">kernel-module-headers</Dependency>
<Dependency version="4.6.3">kernel-module-headers</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
@@ -27,7 +26,7 @@
<IsA>driver</IsA>
<Summary>Kernel module for current NVIDIA graphics driver releases</Summary>
<RuntimeDependencies>
<Dependency version="4.4.8">kernel</Dependency>
<Dependency version="4.6.3">kernel</Dependency>
<!-- <Dependency release="current">module-nvidia-current-userspace</Dependency> -->
</RuntimeDependencies>
<Files>
@@ -83,7 +82,7 @@
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/nvidia-settings.desktop">nvidia-settings.desktop</AdditionalFile>
</AdditionalFiles>
</Package>
<Package>
<Name>nvidia-xconfig</Name>
<IsA>app:console</IsA>
@@ -137,7 +136,6 @@
<RuntimeDependencies>
<Dependency>zlib-32bit</Dependency>
<Dependency>mesa-32bit</Dependency>
<Dependency>libX11-32bit</Dependency>
<Dependency>libXext-32bit</Dependency>
<Dependency release="current">xorg-video-nvidia-current</Dependency>
@@ -155,6 +153,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-04-30</Date>
<Version>367.27</Version>
<Comment>Rebuild for new kernel, ver. bump</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>361.28</Version>
@@ -170,4 +175,4 @@
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>
kernel/drivers/module-nvidia304/actions.py
+2 -1
View File
@@ -30,7 +30,8 @@ def setup():
shelltools.system("sh NVIDIA-Linux-%s-%s.run -x --target tmp"
% (arch, get.srcVERSION()))
shelltools.move("tmp/*", ".")
shelltools.system("patch -p1 < linux-4.6.patch")
#shelltools.system("patch -p0 < nv-drm.patch")
# Our libc is TLS enabled so use TLS library
kernel/drivers/module-nvidia304/files/linux-4.6.patch
+144
View File
@@ -0,0 +1,144 @@
--- /dev/null
+++ b/kernel/nv-mm.h
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ Copyright (c) 2016 NVIDIA Corporation
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+*******************************************************************************/
+#ifndef __NV_MM_H__
+#define __NV_MM_H__
+
+/* get_user_pages_remote() was added by:
+ * 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
+ *
+ * The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653)
+ * deprecated the 8-argument version of get_user_pages for the
+ * non-remote case (calling get_user_pages with current and current->mm).
+ *
+ * The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument
+ * version that uses something other than current and current->mm. Use
+ * NV_GET_USER_PAGES if you are refering to current and current->mm.
+ *
+* Note that get_user_pages_remote() requires the caller to hold a reference on
+* the task_struct (if non-NULL) and the mm_struct. This will always be true
+* when using current and current->mm. If the kernel passes the driver a vma
+* via driver callback, the kernel holds a reference on vma->vm_mm over that
+* callback.
+ */
+
+#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+ #define NV_GET_USER_PAGES get_user_pages
+ #define NV_GET_USER_PAGES_REMOTE get_user_pages_remote
+#else
+ #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
+ get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
+
+ #define NV_GET_USER_PAGES_REMOTE get_user_pages
+#endif
+
+
+#endif // __NV_MM_H__
--- a/kernel/nv-mlock.c
+++ b/kernel/nv-mlock.c
@@ -13,6 +13,7 @@
#include "os-interface.h"
#include "nv-linux.h"
+#include "nv-mm.h"
RM_STATUS NV_API_CALL nv_lock_user_pages(
nv_state_t *nv,
@@ -49,7 +50,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
}
down_read(&mm->mmap_sem);
- ret = get_user_pages(current, mm, (unsigned long)address,
+ ret = NV_GET_USER_PAGES((unsigned long)address,
page_count, write, force, user_pages, NULL);
up_read(&mm->mmap_sem);
pinned = ret;
@@ -62,7 +62,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
else if (pinned < page_count)
{
for (i = 0; i < pinned; i++)
- page_cache_release(user_pages[i]);
+ put_page(user_pages[i]);
os_free_mem(user_pages);
return RM_ERR_INVALID_ADDRESS;
}
@@ -81,7 +81,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
{
pci_unmap_page(dev, pte_array[j],
PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
- page_cache_release(user_pages[j]);
+ put_page(user_pages[j]);
}
os_free_mem(user_pages);
return RM_ERR_OPERATING_SYSTEM;
@@ -114,7 +114,7 @@ RM_STATUS NV_API_CALL os_unlock_user_pages(
PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
if (write)
set_page_dirty_lock(user_pages[i]);
- page_cache_release(user_pages[i]);
+ put_page(user_pages[i]);
}
os_free_mem(user_pages);
diff --git a/kernel/conftest.sh.orig b/kernel/conftest.sh
index d01488b..308ea8a 100755
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -1525,6 +1525,23 @@ compile_test() {
compile_check_conftest "$CODE" "NV_NODE_END_PFN_PRESENT" "" "functions"
;;
+
+ get_user_pages_remote)
+ #
+ # Determine if the function get_user_pages_remote() is
+ # present.
+ #
+ # get_user_pages_remote() was added by:
+ # 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
+ #
+ CODE="
+ #include <linux/mm.h>
+ int conftest_get_user_pages_remote(void) {
+ get_user_pages_remote();
+ }"
+
+ compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions"
+ ;;
esac
}
--- a/kernel/Makefile.kbuild
+++ b/kernel/Makefile.kbuild
@@ -187,7 +187,8 @@ COMPILE_TESTS = \
drm_pci_set_busid \
write_cr4 \
for_each_online_node \
- node_end_pfn
+ node_end_pfn \
+ get_user_pages_remote
#
# CFLAGS dependent on the type of builds (e.g. single/muliple module, debug)
kernel/drivers/module-nvidia304/pspec.xml
+11 -5
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
@@ -16,10 +15,10 @@
<Archive sha1sum="5749a9a77dd68117e2771c06f1b2df6545ddaad1" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86/304.131/NVIDIA-Linux-x86-304.131.run</Archive>
<Archive sha1sum="72a3deaeda15ad8fef7c77b98f2370875cdb6a9e" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86_64/304.131/NVIDIA-Linux-x86_64-304.131.run</Archive>
<AdditionalFiles>
<!-- <AdditionalFile target="NVIDIA-Linux-x86_64-304.125-kernel-3.19.patch">NVIDIA-Linux-x86_64-304.125-kernel-3.19.patch</AdditionalFile> -->
<AdditionalFile target="linux-4.6.patch">linux-4.6.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency version="4.4.8">kernel-module-headers</Dependency>
<Dependency version="4.6.3">kernel-module-headers</Dependency>
</BuildDependencies>
</Source>
@@ -27,7 +26,7 @@
<Name>module-nvidia304</Name>
<Summary>Kernel module for NVIDIA driver 304.xx releases</Summary>
<RuntimeDependencies>
<Dependency version="4.4.8">kernel</Dependency>
<Dependency version="4.6.3">kernel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
@@ -66,6 +65,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-07-17</Date>
<Version>304.131</Version>
<Comment>Rebuild for kernel4.6.3</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>304.131</Version>
@@ -81,4 +87,4 @@
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
</PISI>
kernel/drivers/module-nvidia340/actions.py
+11 -7
View File
@@ -24,17 +24,21 @@ xorglibdir= "%s/xorg" % libdir
def setup():
shelltools.system("sh NVIDIA-Linux-%s-%s.run -x --target tmp"
% (arch, get.srcVERSION()))
shelltools.move("tmp/*", ".")
# Our libc is TLS enabled so use TLS library
shelltools.unlink("*-tls.so*")
shelltools.move("tls/*", ".")
# xorg-server provides libwfb.so
shelltools.unlink("libnvidia-wfb.so.*")
shelltools.echo("ld.so.conf", nvlibdir)
shelltools.echo("XvMCConfig", "%s/libXvMCNVIDIA.so" % nvlibdir)
shelltools.system("patch -p1 < linux-4.6.patch")
def build():
# We don't need kernel module for emul32 build
@@ -42,13 +46,13 @@ def build():
return
shelltools.export("SYSSRC", "/lib/modules/%s/build" % KDIR)
shelltools.cd("kernel")
autotools.make("module")
shelltools.cd("uvm")
autotools.make("module")
def install():
@@ -56,10 +60,10 @@ def install():
if not get.buildTYPE() == 'emul32':
# Kernel driver
pisitools.insinto("/lib/modules/%s/extra/nvidia" % KDIR,
"kernel/nvidia.ko")
"kernel/nvidia.ko")
pisitools.insinto("/lib/modules/%s/extra/nvidia" % KDIR,
"kernel/uvm/nvidia-uvm.ko")
"kernel/uvm/nvidia-uvm.ko")
# Command line tools and their man pages
pisitools.dobin("nvidia-smi")
@@ -77,7 +81,7 @@ def install():
pisitools.dolib("libOpenCL.so.1.0.0", libdir)
pisitools.dosym("libOpenCL.so.1.0.0", "%s/libOpenCL.so.1.0" % libdir)
pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir)
pisitools.dolib("libnvidia-opencl.so.%s" % version, libdir)
pisitools.dosym("libnvidia-opencl.so.%s" % version, "%s/libnvidia-opencl.so.1" % libdir)
pisitools.dosym("libnvidia-opencl.so.1", "%s/libnvidia-opencl.so" % libdir)
kernel/drivers/module-nvidia340/files/linux-4.6.patch
+150
View File
@@ -0,0 +1,150 @@
--- /dev/null
+++ b/kernel/nv-mm.h
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ Copyright (c) 2016 NVIDIA Corporation
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+*******************************************************************************/
+#ifndef __NV_MM_H__
+#define __NV_MM_H__
+
+/* get_user_pages_remote() was added by:
+ * 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
+ *
+ * The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653)
+ * deprecated the 8-argument version of get_user_pages for the
+ * non-remote case (calling get_user_pages with current and current->mm).
+ *
+ * The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument
+ * version that uses something other than current and current->mm. Use
+ * NV_GET_USER_PAGES if you are refering to current and current->mm.
+ *
+* Note that get_user_pages_remote() requires the caller to hold a reference on
+* the task_struct (if non-NULL) and the mm_struct. This will always be true
+* when using current and current->mm. If the kernel passes the driver a vma
+* via driver callback, the kernel holds a reference on vma->vm_mm over that
+* callback.
+ */
+
+#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+ #define NV_GET_USER_PAGES get_user_pages
+ #define NV_GET_USER_PAGES_REMOTE get_user_pages_remote
+#else
+ #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
+ get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
+
+ #define NV_GET_USER_PAGES_REMOTE get_user_pages
+#endif
+
+
+#endif // __NV_MM_H__
--- a/kernel/os-mlock.c
+++ b/kernel/os-mlock.c
@@ -13,6 +13,7 @@
#include "os-interface.h"
#include "nv-linux.h"
+#include "nv-mm.h"
RM_STATUS NV_API_CALL os_lock_user_pages(
void *address,
@@ -45,7 +46,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
}
down_read(&mm->mmap_sem);
- ret = get_user_pages(current, mm, (unsigned long)address,
+ ret = NV_GET_USER_PAGES((unsigned long)address,
page_count, write, force, user_pages, NULL);
up_read(&mm->mmap_sem);
pinned = ret;
@@ -59,7 +59,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
else if (pinned < page_count)
{
for (i = 0; i < pinned; i++)
- page_cache_release(user_pages[i]);
+ put_page(user_pages[i]);
os_free_mem(user_pages);
return RM_ERR_INVALID_ADDRESS;
}
@@ -86,7 +86,7 @@ RM_STATUS NV_API_CALL os_unlock_user_pages(
{
if (write)
set_page_dirty_lock(user_pages[i]);
- page_cache_release(user_pages[i]);
+ put_page(user_pages[i]);
}
os_free_mem(user_pages);
diff --git a/kernel/conftest.sh.orig b/kernel/conftest.sh
index d01488b..308ea8a 100755
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -1669,6 +1669,23 @@ compile_test() {
compile_check_conftest "$CODE" "NV_NODE_END_PFN_PRESENT" "" "functions"
;;
+
+ get_user_pages_remote)
+ #
+ # Determine if the function get_user_pages_remote() is
+ # present.
+ #
+ # get_user_pages_remote() was added by:
+ # 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
+ #
+ CODE="
+ #include <linux/mm.h>
+ int conftest_get_user_pages_remote(void) {
+ get_user_pages_remote();
+ }"
+
+ compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions"
+ ;;
esac
}
diff --git a/kernel/Makefile.orig b/kernel/Makefile
index 438d487..c52a36c 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -139,7 +139,8 @@ COMPILE_TESTS = \
drm_pci_set_busid \
write_cr4 \
for_each_online_node \
- node_end_pfn
+ node_end_pfn \
+ get_user_pages_remote
#
# CFLAGS dependent on the type of builds (e.g. single/muliple module, debug)
diff --git a/kernel/uvm/nvidia_uvm_lite.c.orig b/kernel/uvm/nvidia_uvm_lite.c
index 442a0a8..695f092 100644
--- a/kernel/uvm/nvidia_uvm_lite.c
+++ b/kernel/uvm/nvidia_uvm_lite.c
@@ -785,7 +785,7 @@ int _fault_common(struct vm_area_struct *vma, unsigned long vaddr,
// a reference so that the fault handling logic is correct:
//
get_page(pTracking->uvmPage);
- retValue = VM_FAULT_MINOR;
+ retValue = 0;
}
pRecord->isMapped = NV_TRUE;
kernel/drivers/module-nvidia340/pspec.xml
+13 -5
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
@@ -14,8 +13,11 @@
<Description>NVIDIA graphics drivers provide optimized 2D/3D performance.</Description>
<Archive sha1sum="082e5218059b565f652236a69e61d8426696098c" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run</Archive>
<Archive sha1sum="1cfabc6116192aa5ba46293aa842eb1a5addeeed" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96.run</Archive>
<AdditionalFiles>
<AdditionalFile target="linux-4.6.patch">linux-4.6.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency version="4.4.8">kernel-module-headers</Dependency>
<Dependency version="4.6.3">kernel-module-headers</Dependency>
</BuildDependencies>
</Source>
@@ -24,7 +26,7 @@
<IsA>driver</IsA>
<Summary>Kernel module for NVIDIA driver 340.xx releases</Summary>
<RuntimeDependencies>
<Dependency version="4.4.8">kernel</Dependency>
<Dependency version="4.6.3">kernel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
@@ -71,7 +73,6 @@
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>libvdpau-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency>zlib-32bit</Dependency>
@@ -96,6 +97,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-07-17</Date>
<Version>340.96</Version>
<Comment>Rebuild for new kernel</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>340.96</Version>
@@ -111,4 +119,4 @@
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
</PISI>
kernel/tools/perf/files/patches/linux/patch-4.6.3.xz
BIN
View File
Binary file not shown.
kernel/tools/perf/pspec.xml
+11 -3
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>Performance analyser tool that makes full use of the Linux performance counter subsystem</Summary>
<Description>perf is a new tool which is used to optimize, validate and measure applications, workloads or the full system through the Linux performance counter subsystem.</Description>
<Archive sha1sum="180ab617036593212274177eff3a67f437c1b5ea" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.gz</Archive>
<Archive sha1sum="57cd77757651a05a2e63b2faac010fc17ce399e7" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.6.tar.gz</Archive>
<BuildDependencies>
<Dependency>libunwind-devel</Dependency>
<Dependency>audit-devel</Dependency>
@@ -36,7 +36,7 @@
</BuildDependencies>
<Patches>
<!-- Linux patches -->
<Patch level="1" compressionType="xz">patches/linux/patch-4.4.8.xz</Patch>
<Patch level="1" compressionType="xz">patches/linux/patch-4.6.3.xz</Patch>
</Patches>
</Source>
@@ -64,9 +64,17 @@
<Path fileType="header">/usr/include</Path>
<Path fileType="man">/usr/share/man/</Path>
<Path fileType="data">/usr/share/perf-core</Path>
<Path fileType="data">/usr/share/doc/perf-tip</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2016-07-13</Date>
<Version>4.6.3</Version>
<Comment>Version bump</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="2">
<Date>2016-05-02</Date>
<Version>4.4.8</Version>
@@ -82,4 +90,4 @@
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
</PISI>
multimedia/editor/blender/pspec.xml
+2 -2
View File
@@ -41,7 +41,7 @@
<Dependency>openjpeg-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency versionFrom="1.5.19">openimageio-devel</Dependency>
<Dependency>openimageio-devel</Dependency>
<Dependency>webp-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>python3-requests</Dependency>
@@ -80,7 +80,7 @@
<Dependency>openjpeg</Dependency>
<Dependency>python3</Dependency>
<Dependency>tiff</Dependency>
<Dependency versionFrom="1.5.19">openimageio</Dependency>
<Dependency>openimageio</Dependency>
<Dependency>zlib</Dependency>
</RuntimeDependencies>
<Files>
multimedia/video/obs-studio/actions.py
+20
View File
@@ -0,0 +1,20 @@
#!/usr/bin/env 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 cmaketools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr")
def build():
cmaketools.make()
def install():
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("CONTRIBUTING", "COPYING", "README")
multimedia/video/obs-studio/files/obs-logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

multimedia/video/obs-studio/files/obs-studio.desktop
+14
View File
@@ -0,0 +1,14 @@
[Desktop Entry]
Type=Application
Version=1.0
Encoding=UTF-8
Name=obs-studio
GenericName=obs-studio
GenericName[tr]=obs-studio
Comment=OBS-Studio is a rewrite of what was formerly known as Open Broadcaster Software
Comment[tr]=OBS-Studio is a rewrite of what was formerly known as Open Broadcaster Software
Icon=/usr/share/pixmaps/obs-logo.png
Exec=/usr/bin/obs
Terminal=false
StartupNotify=false
Categories=Multimedia;Video
multimedia/video/obs-studio/pspec.xml
+116
View File
@@ -0,0 +1,116 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>obs-studio</Name>
<Homepage>https://obsproject.com/</Homepage>
<Packager>
<Name>Stefan Gronewold (groni)</Name>
<Email>groni@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Icon>obs-studio</Icon>
<IsA>app:gui</IsA>
<Summary>OBS-Studio is a rewrite of what was formerly known as Open Broadcaster Software</Summary>
<Description>OBS-Studio software was originally designed for recording and streaming live video content, efficiently</Description>
<Archive sha1sum="898a0e37ed0deb03704d81d244f661ce0ec613f4" type="targz">https://github.com/groni/Sources/raw/master/obs-studio-0.15.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>curl-devel</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>x264-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>eudev-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libv4l-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>jansson-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>libv4l-devel</Dependency>
<Dependency>vlc-devel</Dependency>
<Dependency>vlc-libs</Dependency>
<Dependency>pkgconfig</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>libXfixes-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency>libXcomposite-devel</Dependency>
<Dependency>qt5-x11extras-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>jack-audio-connection-kit-devel</Dependency>
<Dependency>cmake</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>obs-studio</Name>
<RuntimeDependencies>
<Dependency>curl</Dependency>
<Dependency>dbus</Dependency>
<Dependency>x264</Dependency>
<Dependency>zlib</Dependency>
<Dependency>eudev</Dependency>
<Dependency>ffmpeg</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libv4l</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>jansson</Dependency>
<Dependency>alsa-lib</Dependency>
<Dependency>freetype</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>libXfixes</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>vlc-libs</Dependency>
<Dependency>ffmpeg</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>pulseaudio-libs</Dependency>
<Dependency>jack-audio-connection-kit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/obs-studio.desktop">obs-studio.desktop</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/pixmaps/obs-logo.png">obs-logo.png</AdditionalFile>
</AdditionalFiles>
</Package>
<Package>
<Name>obs-studio-devel</Name>
<Summary>Development files for obs-studio</Summary>
<RuntimeDependencies>
<Dependency release="current">obs-studio</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files>
<Provides>
</Provides>
</Package>
<History>
<Update release="2">
<Date>2016-07-21</Date>
<Version>0.15.2</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-07-13</Date>
<Version>0.15.1</Version>
<Comment>First release</Comment>
<Name>Stefan Gronewold (groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>
multimedia/video/obs-studio/translations.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>obs-studio</Name>
<Summary xml:lang="tr">OBS-Studio is a rewrite of what was formerly known as Open Broadcaster
Software</Summary>
<Description xml:lang="tr">OBS-Studio software was originally designed for recording and streaming live
video content, efficiently</Description>
</Source>
</PISI>
multimedia/video/pisi-index.xml
+4090
View File
File diff suppressed because it is too large Load Diff
multimedia/video/pisi-index.xml.sha1sum
+1
View File
@@ -0,0 +1 @@
5b6a51065a73128cb1c51875cdf6e5793b5680c5
multimedia/video/pisi-index.xml.xz
BIN
View File
Binary file not shown.
multimedia/video/pisi-index.xml.xz.sha1sum
+1
View File
@@ -0,0 +1 @@
889b86efc24137a70560daa6653a7077b5fb86de
multimedia/video/x264/actions.py
+4 -2
View File
@@ -9,7 +9,7 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
verMAJOR = "0"
verMAJOR = "142"
verMINOR = "0"
staticlibfile = "/usr/lib/libx264.a"
@@ -30,6 +30,7 @@ def setup():
pisitools.dosed("configure", "-lgpac_static", "-lgpac")
# these disables are here to prevent circular deps, especially with ffmpeg
# Not delete --bit-depth=8 \
autotools.rawConfigure("--prefix=/usr \
--enable-pic \
--enable-shared \
@@ -38,6 +39,7 @@ def setup():
--disable-lavf \
--disable-swscale \
--bit-depth=10 \
--bit-depth=8 \
")
def build():
@@ -47,7 +49,7 @@ def install():
autotools.install()
#verMINOR = getMinorVersion()
#pisitools.dosym("libx264.so.%s.%s" % (verMAJOR, verMINOR), "/usr/lib/libx264.so.%s" % verMAJOR)
pisitools.dosym("libx264.so.%s.%s" % (verMAJOR, verMINOR), "/usr/lib/libx264.so.%s" % verMAJOR)
# No static libs
if shelltools.isFile("%s/%s" % (get.installDIR(), staticlibfile)):
multimedia/video/x264/pspec.xml
+7
View File
@@ -45,6 +45,13 @@
</Package>
<History>
<Update release="4">
<Date>2016-07-22</Date>
<Version>2245.12062016</Version>
<Comment>Fix relase</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-06-13</Date>
<Version>2245.12062016</Version>
network/plugin/pepperflash/actions.py
+7 -2
View File
@@ -5,7 +5,12 @@
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
WorkDir = "."
def install():
pisitools.insinto("usr/lib/chromium-browser/PepperFlash/", "manifest.json")
pisitools.insinto("usr/lib/chromium-browser/PepperFlash/", "libpepflashplayer.so")
pisitools.insinto("usr/lib/chromium-browser/PepperFlash/", "./PepperFlash/manifest.json")
pisitools.insinto("usr/lib/chromium-browser/PepperFlash/", "./PepperFlash/libpepflashplayer.so")
pisitools.insinto("usr/lib/chromium-browser/", "./chromium-browser/libwidevinecdmadapter.so")
pisitools.insinto("usr/lib/chromium-browser/", "./chromium-browser/libwidevinecdm.so")
network/plugin/pepperflash/pspec.xml
+9 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Google Chrome's Pepper Flash plugin for Chromium.</Summary>
<Description>Google Chrome's Pepper Flash plugin for Chromium (stable version)</Description>
<Archive sha1sum="e66d02a3c265c8741c70bc209c3755481f0d1b98" type="targz">https://dl.dropboxusercontent.com/s/o5xtb8my3cswzwv/pepperflash-22.0.0.192.tar.gz</Archive>
<Archive sha1sum="6ab01b5c3330afb8b3eb8a3d4b7522cdde939e73" type="targz">https://sourceforge.net/projects/pisi-source/files/pepperflash-22.0.0.209.tar.gz</Archive>
</Source>
<Package>
@@ -22,6 +22,7 @@
</RuntimeDependencies>
<Files>
<Path fileType="data">/etc/chromium-browser</Path>
<Path fileType="library">/usr/lib/chromium-browser/</Path>
<Path fileType="library">/usr/lib/chromium-browser/PepperFlash</Path>
</Files>
<AdditionalFiles>
@@ -31,6 +32,13 @@
<History>
<Update release="4">
<Date>2016-07-22</Date>
<Version>22.0.0.209</Version>
<Comment>Version Bump</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-06-30</Date>
<Version>22.0.0.192</Version>
network/web/chromium-browser/actions.py
-2
View File
@@ -100,8 +100,6 @@ def install():
pisitools.insinto("/usr/lib/chromium-browser", "chromedriver")
pisitools.insinto("/usr/lib/chromium-browser", "natives_blob.bin")
pisitools.insinto("/usr/lib/chromium-browser", "snapshot_blob.bin")
pisitools.insinto("/usr/lib/chromium-browser", "libwidevinecdm.so")
pisitools.insinto("/usr/lib/chromium-browser", "libwidevinecdmadapter.so")
pisitools.insinto("/usr/lib/chromium-browser", "character_data_generator")
pisitools.insinto("/usr/lib/chromium-browser", "chrome_sandbox", "chrome-sandbox")
network/web/chromium-browser/files/chromium-browser.desktop
+1 -1
View File
@@ -103,7 +103,7 @@ Comment[vi]=Truy cập Internet
Comment[zh_CN]=访问互联网
Comment[zh_HK]=連線到網際網路
Comment[zh_TW]=連線到網際網路
Exec=chromium-browser %U --ppapi-flash-path=/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so --ppapi-flash-version=22.0.0.192
Exec=chromium-browser %U --ppapi-flash-path=/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so --ppapi-flash-version=$version
Terminal=false
Icon=chromium-browser
Type=Application
network/web/chromium-browser/files/chromium-widevine.patch
-43
View File
@@ -1,46 +1,3 @@
diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc chromium-48.0.2564.82/chrome/common/chrome_content_client.cc
--- chromium-48.0.2564.82.orig/chrome/common/chrome_content_client.cc 2016-01-20 22:01:20.000000000 +0200
+++ chromium-48.0.2564.82/chrome/common/chrome_content_client.cc 2016-01-21 20:02:02.788936626 +0200
@@ -158,7 +158,12 @@ void ComputeBuiltInPlugins(std::vector<c
#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
!defined(WIDEVINE_CDM_IS_COMPONENT)
static bool skip_widevine_cdm_file_check = false;
- if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
+ bool widevine_cdm_present =
+ skip_widevine_cdm_file_check ||
+ (PathService::Get(chrome::FILE_WIDEVINE_CDM, &path) &&
+ base::PathExists(path));
+ if (widevine_cdm_present &&
+ PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
if (skip_widevine_cdm_file_check || base::PathExists(path)) {
content::PepperPluginInfo widevine_cdm;
widevine_cdm.is_out_of_process = true;
diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc chromium-48.0.2564.82/chrome/common/chrome_paths.cc
--- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.cc 2016-01-20 22:01:20.000000000 +0200
+++ chromium-48.0.2564.82/chrome/common/chrome_paths.cc 2016-01-21 19:18:51.287978456 +0200
@@ -375,6 +375,11 @@ bool PathProvider(int key, base::FilePat
return false;
cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
break;
+ case chrome::FILE_WIDEVINE_CDM:
+ if (!GetInternalPluginsDirectory(&cur))
+ return false;
+ cur = cur.AppendASCII(kWidevineCdmFileName);
+ break;
#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
case chrome::FILE_RESOURCES_PACK:
#if defined(OS_MACOSX) && !defined(OS_IOS)
diff -upr chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h chromium-48.0.2564.82/chrome/common/chrome_paths.h
--- chromium-48.0.2564.82.orig/chrome/common/chrome_paths.h 2016-01-14 03:49:22.000000000 +0200
+++ chromium-48.0.2564.82/chrome/common/chrome_paths.h 2016-01-21 19:18:51.287978456 +0200
@@ -99,6 +99,7 @@ enum {
DIR_COMPONENT_WIDEVINE_CDM, // Directory that contains component-updated
// Widevine CDM files.
FILE_WIDEVINE_CDM_ADAPTER, // Full path to the Widevine CDM adapter file.
+ FILE_WIDEVINE_CDM, // Full path to the Widevine CDM file.
FILE_RESOURCES_PACK, // Full path to the .pak file containing
// binary data (e.g., html files and images
// used by internal pages).
diff -upr chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h
--- chromium-48.0.2564.82.orig/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-14 01:05:17.000000000 +0200
+++ chromium-48.0.2564.82/third_party/widevine/cdm/stub/widevine_cdm_version.h 2016-01-21 19:18:51.287978456 +0200
network/web/chromium-browser/pspec.xml
+9 -2
View File
@@ -13,7 +13,7 @@
<IsA>app:gui</IsA>
<Summary>A WebKit powered web browser</Summary>
<Description>Chromium-browser is an open-source web browser, powered by WebKit.</Description>
<Archive sha1sum="5212b0f96be80c0146f7caf0883cfb39a3827177" type="tarxz">http://gsdview.appspot.com/chromium-browser-official/chromium-51.0.2704.106.tar.xz</Archive>
<Archive sha1sum="427ae146c164f5c6289958476194696de36173ac" type="tarxz">http://gsdview.appspot.com/chromium-browser-official/chromium-52.0.2743.82.tar.xz</Archive>
<BuildDependencies>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>at-spi2-atk-devel</Dependency>
@@ -87,7 +87,7 @@
<Patch level="1">PNGImageDecoder.patch</Patch>
<Patch level="1">chromium-widevine.patch</Patch>
<Patch level="1">pisilinux/gfx_jpeg_codec.patch</Patch>
<Patch level="1">pisilinux/fix_build_with_newer_gcc.patch</Patch>
<Patch level="1">pisilinux/fix_build_with_newer_gcc.patch</Patch>
</Patches>
</Source>
<Package>
@@ -153,6 +153,13 @@
</Package>
<History>
<Update release="4">
<Date>2016-07-22</Date>
<Version>52.0.2743.82</Version>
<Comment>Version Bump.</Comment>
<Name>Ergün Salman</Name>
<Email>poyraz76@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-07-05</Date>
<Version>51.0.2704.106</Version>
pisi-index.xml
+87467 -87012
View File
File diff suppressed because it is too large Load Diff
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
f025d8ca24d07afa5a9c4289f9195031220049ca
1c47c043b8b414a46ef21c88b9d493361a6a259d
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
f4f5b6d6ea9817e04dab42f4c213df9f2d684096
f9b4347fcffbc17cdc91397fcffd22a4f1f4f201
programming/language/R/actions.py
+61
View File
@@ -0,0 +1,61 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.export("R_HOME_DIR", "/usr/lib/R")
shelltools.export("BLAS_LIBS","/usr/lib")
shelltools.export("LAPACK_LIBS","-L/usr/lib -llapack -lblas")
autotools.aclocal("-I m4")
autotools.autoconf()
autotools.configure("--prefix=/usr \
--with-recommended-packages \
--enable-R-profiling \
--enable-R-shlib \
--enable-shared \
--enable-prebuilt-html \
--disable-openmp \
--with-blas=-lblas \
--with-lapack \
--without-tcltk \
--with-readline \
--with-system-pcre \
--with-system-zlib \
--with-system-bzlib \
--with-system-xz \
rdocdir=/usr/share/doc/R \
rincludedir=/usr/include \
--with-x")
def build():
shelltools.export("R_HOME","")
autotools.make()
# build math library
shelltools.cd("src/nmath/standalone")
autotools.make("-j1")
#def check():
#shelltools.export("R_HOME","")
#autotools.make("check")
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
# install math library remove static libs
autotools.install("-C src/nmath/standalone")
pisitools.rename("/usr/lib/libRmath.so","libRmath.so.0.0.0")
pisitools.dosym("/usr/lib/libRmath.so.0.0.0","/usr/lib/libRmath.so.0")
pisitools.dosym("/usr/lib/libRmath.so.0.0.0","/usr/lib/libRmath.so")
pisitools.remove("/usr/lib/libRmath.a")
programming/language/R/comar/package.py
+6
View File
@@ -0,0 +1,6 @@
#!/usr/bin/python
import os
def postInstall(fromVersion, fromRelease, toVersion, toRelease):
os.system("R CMD javareconf")
programming/language/R/files/99R
+2
View File
@@ -0,0 +1,2 @@
R_HOME_DIR=/usr/lib/R
R_HOME=/usr/lib/R
programming/language/R/files/R-2.11.1-parallel.patch
+11
View File
@@ -0,0 +1,11 @@
--- src/include/Makefile.in.orig 2010-06-15 18:18:54.000000000 +0000
+++ src/include/Makefile.in 2010-06-15 18:19:48.000000000 +0000
@@ -81,7 +81,7 @@
Rmath.h0: $(srcdir)/Rmath.h0.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install: installdirs install-intl-@USE_INCLUDED_LIBINTL@
+install: $(OBJ_HEADERS) installdirs install-intl-@USE_INCLUDED_LIBINTL@
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
programming/language/R/files/R-2.13.1-zlib_header_fix.patch
+13
View File
@@ -0,0 +1,13 @@
--- src/main/unzip.h.orig 2011-09-24 19:35:53.000000000 -0700
+++ src/main/unzip.h 2011-09-24 19:37:06.000000000 -0700
@@ -58,6 +58,10 @@
#define ZLIB_FILEFUNC_SEEK_END (2)
#define ZLIB_FILEFUNC_SEEK_SET (0)
+#ifndef OF
+#define OF(x) x
+#endif
+
#define ZLIB_FILEFUNC_MODE_READ (1)
#define ZLIB_FILEFUNC_MODE_WRITE (2)
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
programming/language/R/files/Rscript.patch
+12
View File
@@ -0,0 +1,12 @@
diff -Nuar R-2.7.1.orig/src/unix/Makefile.in R-2.7.1/src/unix/Makefile.in
--- R-2.7.1.orig/src/unix/Makefile.in 2008-06-23 12:38:27.000000000 +0300
+++ R-2.7.1/src/unix/Makefile.in 2008-06-24 16:40:23.000000000 +0300
@@ -66,7 +66,7 @@
## we need to build at install time to capture the correct 'rhome'
install-Rscript:
- $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \
+ $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"/usr/lib/R/"' -o Rscript \
$(srcdir)/Rscript.c
@$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecbindir)"
@$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(Rexecbindir)/Rscript"
programming/language/R/files/config_site.patch
+43
View File
@@ -0,0 +1,43 @@
diff -Nuar R-2.12.1.orig//config.site R-2.12.1/config.site
--- R-2.12.1.orig//config.site 2010-11-14 01:05:06.000000000 +0200
+++ R-2.12.1/config.site 2010-12-22 07:11:10.429000021 +0200
@@ -28,7 +28,7 @@
## The paper size for the local (PostScript) printer.
## It must either be left blank or set to one of 'a4' or 'letter'.
## If left blank the system will use 'a4'.
-## R_PAPERSIZE=a4
+ R_PAPERSIZE=a4
## Set the default behavior of R when ending a session
## Set this to one of '--save' or '--no-save' depending whether you
@@ -207,23 +207,26 @@
## If unset configure searches in turn for (currently)
## firefox mozilla galeon opera xdg-open kfmclient gnome-moz-remote open
## and uses the full path.
-## R_BROWSER=
+R_BROWSER=xdg-open
+
+## Default pdf viewer
+R_PDFVIEWER=xdg-open
## BLAS and LAPACK settings
## Use BLAS_LIBS for all '-L' and '-l' options needed for linking
## against an external BLAS implementation.
-## BLAS_LIBS=
+## BLAS_LIBS=/usr/lib
## Use LAPACK_LIBS for all '-L' and '-l' options needed for linking
## against an external LAPACK implementation.
## Note that (see R-admin) that our main intention is to allow a
## LAPACK-containing BLAS to be used, so this is rarely needed, and
## it is not used if the BLAS already contains LAPACK.
-## LAPACK_LIBS=
+## LAPACK_LIBS="-L/usr/lib -llapack -lblas"
## Make name.
## Set this if you want to use a make by another name.
## For example, if your GNU make is called 'gmake', use 'MAKE=gmake'.
-## MAKE=
+MAKE=gmake
## Tar name
## Set this to prefer a tar which has the capability to automagically
programming/language/R/files/dont_use_atlas.patch
+42
View File
@@ -0,0 +1,42 @@
diff -Nuar R-2.11.0.orig/configure.ac R-2.11.0/configure.ac
--- R-2.11.0.orig/configure.ac 2010-04-01 01:10:02.000000000 +0300
+++ R-2.11.0/configure.ac 2010-05-02 18:42:50.276871339 +0300
@@ -2508,7 +2508,6 @@
if test "${acx_blas_ok}" = "yes"; then
## Try to figure out which BLAS was used.
case "${BLAS_LIBS0}" in
- *-latlas*) r_blas=ATLAS ;;
*-lsgemm*) r_blas=PhiPack ;;
*sunperf*) r_blas=SunPerf ;;
*-lessl*) r_blas=ESSL ;;
diff -Nuar R-2.11.0.orig/m4/R.m4 R-2.11.0/m4/R.m4
--- R-2.11.0.orig/m4/R.m4 2010-03-28 01:10:03.000000000 +0200
+++ R-2.11.0/m4/R.m4 2010-05-02 18:44:38.987876278 +0300
@@ -2536,19 +2536,6 @@
fi
fi
-## BLAS linked to by default? (happens on some supercomputers)
-if test "${acx_blas_ok}" = no; then
- AC_CHECK_FUNC(${dgemm}, [acx_blas_ok=yes])
-fi
-
-## BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
-if test "${acx_blas_ok}" = no; then
- AC_CHECK_LIB(atlas, ATL_xerbla,
- [AC_CHECK_LIB(f77blas, ${dgemm},
- [acx_blas_ok=yes
- BLAS_LIBS="-lf77blas -latlas"],
- [], [-latlas])])
-fi
## BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
if test "${acx_blas_ok}" = no; then
@@ -2744,7 +2731,6 @@
F77_SYMBOL(drotmg)();
F77_SYMBOL(dsbmv)();
F77_SYMBOL(dscal)();
- F77_SYMBOL(dsdot)();
F77_SYMBOL(dspmv)();
F77_SYMBOL(dspr)();
F77_SYMBOL(dspr2)();
programming/language/R/files/ld.so.conf
+1
View File
@@ -0,0 +1 @@
/usr/lib/R/lib
programming/language/R/files/lib64.patch
+31
View File
@@ -0,0 +1,31 @@
diff -Nuar R-3.0.1.orig/configure.ac R-3.0.1/configure.ac
--- R-3.0.1.orig/configure.ac 2013-03-25 01:05:05.000000000 +0200
+++ R-3.0.1/configure.ac 2013-05-18 23:41:55.803629789 +0300
@@ -137,7 +137,7 @@
linux*)
## Not all distros use this: some choose to march out of step
case "${host_cpu}" in
- x86_64|mips64|ppc64|powerpc64|sparc64|s390x)
+ mips64|ppc64|powerpc64|sparc64|s390x)
if test -d /usr/lib64; then
libnn=lib64
fi
diff -Nuar R-3.0.1.orig/src/scripts/R.sh.in R-3.0.1/src/scripts/R.sh.in
--- R-3.0.1.orig/src/scripts/R.sh.in 2013-03-06 01:02:41.000000000 +0200
+++ R-3.0.1/src/scripts/R.sh.in 2013-05-18 23:42:28.075630689 +0300
@@ -7,13 +7,13 @@
linux*)
run_arch=`uname -m`
case "$run_arch" in
- x86_64|mips64|ppc64|powerpc64|sparc64|s390x)
+ mips64|ppc64|powerpc64|sparc64|s390x)
libnn=lib64
libnn_fallback=lib
;;
*)
libnn=lib
- libnn_fallback=lib64
+ libnn_fallback=lib
;;
esac
if [ -x "@prefix@/${libnn}/R/bin/exec/R" ]; then
programming/language/R/pspec.xml
+132
View File
@@ -0,0 +1,132 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>R</Name>
<Homepage>http://www.r-project.org</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<License>LGPLv2.1</License>
<IsA>app:console</IsA>
<Summary>A free software environment for statistical computing and graphics</Summary>
<Description>This package includes the core R userspace and all R development components.</Description>
<Archive sha1sum="df853188d3e2b1c2d32393016401c432a5192c4d" type="targz">http://cran.r-project.org/src/base/R-3/R-3.3.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>libXmu-devel</Dependency>
<Dependency>icu4c-devel</Dependency>
<Dependency>jdk7-openjdk</Dependency>
<Dependency>xdg-utils</Dependency>
<Dependency>blas-devel</Dependency>
<Dependency>lapack-devel</Dependency>
<Dependency>libXt-devel</Dependency>
<Dependency>libSM-devel</Dependency>
<Dependency>cairo-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>libgfortran</Dependency>
<Dependency>xz-devel</Dependency>
<Dependency>readline-devel</Dependency>
<Dependency>curl-devel</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="1">Rscript.patch</Patch>-->
<!--<Patch level="1">dont_use_atlas.patch</Patch>
<Patch level="1">config_site.patch</Patch-->
<Patch level="0">R-2.11.1-parallel.patch</Patch>
<Patch level="0">R-2.13.1-zlib_header_fix.patch</Patch>
<!--Patch level="1">lib64.patch</Patch-->
</Patches>
</Source>
<Package>
<Name>R</Name>
<RuntimeDependencies>
<Dependency>blas</Dependency>
<Dependency>make</Dependency>
<Dependency>tiff</Dependency>
<Dependency>libXt</Dependency>
<Dependency>icu4c</Dependency>
<Dependency>libSM</Dependency>
<Dependency>cairo</Dependency>
<Dependency>pango</Dependency>
<Dependency>libXmu</Dependency>
<Dependency>lapack</Dependency>
<Dependency>xdg-utils</Dependency>
<Dependency>libgfortran</Dependency>
<Dependency>jre7-openjdk</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>xz</Dependency>
<Dependency>curl</Dependency>
<Dependency>zlib</Dependency>
<Dependency>bzip2</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libpng</Dependency>
<Dependency>libpcre</Dependency>
<Dependency>readline</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/R</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
<AdditionalFiles>
<AdditionalFile target="/etc/env.d/99R" owner="root" permission="0644">99R</AdditionalFile>
<AdditionalFile target="/etc/ld.so.conf.d/99-R.conf" owner="root" permission="0644">ld.so.conf</AdditionalFile>
</AdditionalFiles>
<Provides>
<COMAR script="package.py">System.Package</COMAR>
</Provides>
</Package>
<Package>
<Name>R-mathlib</Name>
<IsA>library</IsA>
<Summary>Math library for R</Summary>
<RuntimeDependencies>
<Dependency version="current">R</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="header">/usr/include/Rmath.h</Path>
</Files>
</Package>
<Package>
<Name>R-docs</Name>
<IsA>data:doc</IsA>
<Summary>Documents for R</Summary>
<Files>
<Path fileType="doc">/usr/share/doc/R</Path>
</Files>
</Package>
<Package>
<Name>R-devel</Name>
<Summary>Development files for R</Summary>
<RuntimeDependencies>
<Dependency release="current">R</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig/libR.pc</Path>
<Path fileType="library">/usr/lib/pkgconfig/libRmath.pc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-06-27</Date>
<Version>3.3.1</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
programming/language/R/translations.xml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>R</Name>
<Summary xml:lang="tr">R özgür istatistik ve grafik ortamı</Summary>
<Description xml:lang="tr">R özgür istatistik ve grafik ortamı</Description>
</Source>
<Package>
<Name>R-devel</Name>
<Summary xml:lang="tr">R için geliştirme dosyaları</Summary>
</Package>
<Package>
<Name>R-docs</Name>
<Summary xml:lang="tr">R belgeleri</Summary>
</Package>
<Package>
<Name>R-mathlib</Name>
<Summary xml:lang="tr">R Mathlib kitaplığı</Summary>
</Package>
</PISI>
programming/language/python3/python3-youtube_dl/actions.py
+13
View File
@@ -0,0 +1,13 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
import glob
def install():
pythonmodules.install(pyVer = "3")
programming/language/python3/python3-youtube_dl/pspec.xml
+47
View File
@@ -0,0 +1,47 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>python3-youtube_dl</Name>
<Homepage>http://rg3.github.io/youtube-dl</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv3</License>
<Icon>youtube_dl</Icon>
<IsA>app:console</IsA>
<Summary>Youtube Video Downloader</Summary>
<Description>Youtube Video Downloader</Description>
<Archive sha1sum="1075e03c48040e7ef84d4bbeef43b0911688b429" type="targz">https://github.com/rg3/youtube-dl/archive/2016.07.17.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-setuptools</Dependency>
<Dependency>python3-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>python3-youtube_dl</Name>
<RuntimeDependencies>
<Dependency>python3</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/etc</Path>
<Path fileType="data">/usr/lib/python3.4/site-packages</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/man/man1</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-07-21</Date>
<Version>2016.07.17</Version>
<Comment>First release</Comment>
<Name>Metehan Özbek</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
programming/language/python3/python3-youtube_dl/translations.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>python3-youtube_dl</Name>
<Summary xml:lang="tr">Youtube video indirici.</Summary>
<Description xml:lang="tr">Youtube'dan video indirmeyi sağlayan bir uygulama.</Description>
</Source>
</PISI>