Merge pull request #8791 from 4fury-c3440d8/master

devedeNG, dvdauthor: version bump, lxqt homepages.
This commit is contained in:
Kamil ATLI
2020-09-27 22:28:30 +03:00
committed by GitHub
47 changed files with 371 additions and 129 deletions
+7 -5
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>compton-conf</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://github.com/lxqt/compton-conf</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
@@ -37,7 +39,7 @@
<Path fileType="config">/etc/autostart</Path>
</Files>
<AdditionalFiles>
<AdditionalFile permission="0644" owner="root" target="/usr/share/applications/compton-conf.desktop">compton-conf.desktop</AdditionalFile>
<AdditionalFile permission="0644" owner="root" target="/usr/share/applications/compton-conf.desktop">compton-conf.desktop</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
@@ -48,14 +50,14 @@
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Update release="8">
<Date>2020-04-06</Date>
<Version>0.14.1</Version>
<Comment>rebuild for qt5.14.2</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="7">
</Update>
<Update release="7">
<Date>2019-08-16</Date>
<Version>0.14.1</Version>
<Comment>rebuild for qt5.13.0</Comment>
+1 -1
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>libfm-extra</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://www.lxde.org/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libfm-qt</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://github.com/lxqt/libfm-qt</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>liblxqt</Name>
<Homepage>http://www.lxqt.org</Homepage>
<Homepage>https://github.com/lxqt/liblxqt</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libqtxdg</Name>
<Homepage>http://www.lxqt.org</Homepage>
<Homepage>https://github.com/lxqt/libqtxdg</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+1 -1
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>libstatgrab</Name>
<Homepage>http://www.i-scream.org/libstatgrab</Homepage>
<Homepage>https://libstatgrab.org/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libsysstat</Name>
<Homepage>http://www.lxqt.org</Homepage>
<Homepage>https://github.com/lxqt/libsysstat</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lximage-qt</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://lxqt.github.io/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxmenu-data</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://www.lxde.org/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-about</Name>
<Homepage>http://www.lxqt.org</Homepage>
<Homepage>https://github.com/lxqt/lxqt-about</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+2
View File
@@ -1,3 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-admin</Name>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org.tr/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-archiver</Name>
+5 -2
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-build-tools</Name>
<Homepage>http://www.lxqt.org</Homepage>
<Homepage>https://github.com/lxqt/lxqt-build-tools</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
@@ -19,6 +21,7 @@
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>lxqt-build-tools</Name>
<Files>
@@ -27,7 +30,7 @@
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="12">
<Date>2020-09-09</Date>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-config</Name>
<Homepage>http://www.lxqt.org</Homepage>
<Homepage>https://github.com/lxqt/lxqt-config</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-globalkeys</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://github.com/lxqt/lxqt-globalkeys</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+4 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-notificationd</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://github.com/lxqt/lxqt-notificationd</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
@@ -23,6 +25,7 @@
<Dependency versionFrom="0.7.0">lxqt-build-tools</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>lxqt-notificationd</Name>
<RuntimeDependencies>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-openssh-askpass</Name>
<Homepage>https://github.com/lxde</Homepage>
<Homepage>https://github.com/lxqt/lxqt-openssh-askpass</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+6 -2
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-panel</Name>
<Homepage>http://www.lxqt.org</Homepage>
<Homepage>https://lxqt.github.io/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
@@ -40,6 +42,7 @@
<Dependency versionFrom="0.7.0">lxqt-build-tools</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>lxqt-panel</Name>
<RuntimeDependencies>
@@ -74,10 +77,11 @@
<Path fileType="man">/usr/share/man</Path>
</Files>
<AdditionalFiles>
<!-- Customizations for Pisi -->
<!-- Customizations for Pisi -->
<AdditionalFile permission="0644" owner="root" target="/usr/share/lxqt/panel.conf">panel.conf</AdditionalFile>
</AdditionalFiles>
</Package>
<Package>
<Name>lxqt-panel-devel</Name>
<Summary>Development headers for lxqt-panel</Summary>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-policykit</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://github.com/lxqt/lxqt-policykit</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-powermanagement</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://lxqt.github.io/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-qtplugin</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://lxqt.github.io/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-runner</Name>
<Homepage>http://www.lxqt.org</Homepage>
<Homepage>https://lxqt.github.io/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-session</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://github.com/lxqt/lxqt-session</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-sudo</Name>
<Homepage>http://lxqt.org/</Homepage>
<Homepage>https://github.com/lxqt/lxqt-sudo</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lxqt-themes</Name>
<Homepage>http://www.lxqt.org</Homepage>
<Homepage>https://lxqt.github.io/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+2 -2
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>lxqt-wallet</Name>
<Homepage>https://github.com/mhogomchungu/lxqt_wallet</Homepage>
<Homepage>https://github.com/lxqt/lxqt_wallet</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
@@ -42,7 +42,7 @@
<Path fileType="localdata">/usr/share/lxqt/translations</Path>
</Files>
</Package>
<Package>
<Name>lxqt-wallet-devel</Name>
<RuntimeDependencies>
+1 -1
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>menu-cache</Name>
<Homepage>http://lxde.org</Homepage>
<Homepage>https://www.lxde.org/</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>obconf-qt</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://github.com/lxqt/obconf-qt</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+3 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>pavucontrol-qt</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://github.com/lxqt/pavucontrol-qt</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
+4 -2
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>pcmanfm-qt</Name>
<Homepage>http://www.lxde.org</Homepage>
<Homepage>https://github.com/lxqt/pcmanfm-qt</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
@@ -32,6 +34,7 @@
<Dependency versionFrom="0.7.0">lxqt-build-tools</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>pcmanfm-qt</Name>
<RuntimeDependencies>
@@ -50,7 +53,6 @@
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share/</Path>
</Files>
<AdditionalFiles>
<AdditionalFile permission="0644" owner="root" target="/usr/share/pcmanfm-qt/lxqt/settings.conf">settings.conf</AdditionalFile>
+4 -1
View File
@@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>qps</Name>
<Homepage>https://github.com/QtDesktop/qps</Homepage>
<Homepage>https://github.com/lxqt/qps</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
@@ -23,6 +25,7 @@
<Dependency versionFrom="0.7.0">lxqt-build-tools</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>qps</Name>
<RuntimeDependencies>
+2
View File
@@ -1,3 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>qterminal</Name>
+2 -2
View File
@@ -37,7 +37,7 @@
</BuildDependencies>
<Patches>
<Patch level="1">overview_plugin_test.patch</Patch>
<Patch level="1">9497d829e1b207eb83575dc6f617feecfb89bc16.patch</Patch>
<Patch level="1">9497d829e1b207eb83575dc6f617feecfb89bc16.patch</Patch>
</Patches>
</Source>
@@ -77,7 +77,7 @@
</Package>
<History>
<Update release="6">
<Update release="6">
<Date>2020-09-22</Date>
<Version>1.36</Version>
<Comment>Rebuild libgit2.</Comment>
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>vcdimager</Name>
<Homepage>http://www.vcdimager.org/</Homepage>
<Homepage>https://www.gnu.org/software/vcdimager/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
+3 -3
View File
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import get
@@ -12,9 +12,9 @@ def setup():
pythonmodules.compile(pyVer = "3")
def build():
pythonmodules.compile(pyVer="3")
pythonmodules.compile(pyVer = "3")
def install():
def install():
pythonmodules.install(pyVer = "3")
pisitools.dodoc("COPYING", "README.md")
+12 -5
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>devedeNG</Name>
<Homepage>http://www.rastersoft.com/programas/devede.html</Homepage>
<Homepage>https://rastersoft.com/programas/devede.html</Homepage>
<Packager>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
@@ -16,7 +16,7 @@
<Description>Devede NG is a rewrite of the Devede DVD disc authoring program. This new
code has been written from scratch, and uses Python3 and Gtk3. It is also
cleaner, which will allow to add new features in the future.</Description>
<Archive sha1sum="9a02b56ce8da3e0c0399c7e951841e9113dbd7fe" type="targz">https://sourceforge.net/projects/pisilinux/files/source/devedeng-4.12.0.tar.gz</Archive>
<Archive sha1sum="2457f27a2ee500cf925ce1fec3101d3f25026709" type="tarbz2">https://gitlab.com/rastersoft/devedeng/-/archive/4.16.0/devedeng-4.16.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>gtk3-devel</Dependency>
<Dependency>ffmpeg-devel</Dependency>
@@ -24,7 +24,7 @@ cleaner, which will allow to add new features in the future.</Description>
<Dependency>python3-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">desktop.patch</Patch> -->
<!-- <Patch level="1">desktop.patch</Patch> -->
</Patches>
</Source>
@@ -51,7 +51,7 @@ cleaner, which will allow to add new features in the future.</Description>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man/man1</Path>
</Files>
<!-- <AdditionalFiles>
<!-- <AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/icons/hicolor/16x16/apps/devede.png">devede-16.png</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/icons/hicolor/32x32/apps/devede.png">devede-32.png</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/icons/hicolor/48x48/apps/devede.png">devede-48.png</AdditionalFile>
@@ -59,6 +59,13 @@ cleaner, which will allow to add new features in the future.</Description>
</Package>
<History>
<Update release="3">
<Date>2020-09-27</Date>
<Version>4.16.0</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>wascheme@tuta.io</Email>
</Update>
<Update release="2">
<Date>2020-03-05</Date>
<Version>4.12.0</Version>
+6 -4
View File
@@ -2,9 +2,9 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import shelltools
#from pisi.actionsapi import shelltools
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
@@ -13,8 +13,10 @@ WorkDir = "dvdauthor"
def setup():
# disable ImageMagick, use GraphicsMagick
shelltools.export("MAGICKCONFIG", "/bin/true")
#shelltools.export("MAGICKCONFIG", "/bin/true")
autotools.autoreconf("-fiv")
autotools.configure("--disable-rpath \
--with-graphicsmagick \
--enable-default-video-format=NTSC")
def build():
@@ -23,4 +25,4 @@ def build():
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("TODO", "README", "ChangeLog", "NEWS")
pisitools.dodoc("AUTHORS", "ChangeLog", "README")
@@ -0,0 +1,74 @@
--- a/src/subgen-image.c 2014-01-21 00:12:37.000000000 +0100
+++ b/src/subgen-image.c 2017-11-27 20:26:53.682914041 +0100
@@ -30,7 +30,7 @@
#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
#include <stdarg.h>
-#include <magick/api.h>
+#include <MagickWand/MagickWand.h>
#else
#include <png.h>
#endif
@@ -176,18 +176,18 @@
{
Image *im;
ImageInfo *ii;
- ExceptionInfo ei;
+ ExceptionInfo *ei;
int x,y;
unsigned long magickver;
unsigned char amask;
- GetExceptionInfo(&ei);
+ ei = AcquireExceptionInfo();
ii=CloneImageInfo(NULL);
strcpy(ii->filename,s->fname);
- im=ReadImage(ii,&ei);
+ im=ReadImage(ii,ei);
if( !im ) {
- MagickError(ei.severity,"Unable to load file",ii->filename);
+ MagickError(ei->severity,"Unable to load file",ii->filename);
return -1;
}
@@ -202,10 +202,10 @@
for( y=0; y<im->rows; y++ ) {
char pdata[MAXX*4];
- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) {
- fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description);
- CatchException(&ei);
- MagickError(ei.severity,ei.reason,ei.description);
+ if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) {
+ fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei->reason,ei->description);
+ CatchException(ei);
+ MagickError(ei->severity,ei->reason,ei->description);
DestroyImage(im);
return -1;
}
@@ -219,7 +219,7 @@
}
}
DestroyImage(im);
- DestroyExceptionInfo(&ei);
+ DestroyExceptionInfo(ei);
fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
return 0;
@@ -1098,13 +1098,13 @@
void image_init()
{
#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
- InitializeMagick(NULL);
+ MagickCoreGenesis("", MagickFalse);
#endif
}
void image_shutdown()
{
#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
- DestroyMagick();
+ MagickCoreTerminus();
#endif
}
@@ -0,0 +1,115 @@
diff --git a/ChangeLog b/ChangeLog
index 596e22d..1cf42b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.7.2+: 2017 July 4
+ No longer automatically build with ImageMagick or GraphicsMagick if
+ present; now need to explicitly specify --with-imagemagick or
+ --with-graphicsmagick to configure
+
0.7.2: 2016 December 31
Various code-quality and build improvements
Support “jump pgc n” and other interaction code-generation improvements
diff --git a/configure.ac b/configure.ac
index f4b270f..1194059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(DVDAuthor,0.7.2,dvdauthor-users@lists.sourceforge.net)
+AC_INIT(DVDAuthor,0.7.2+,dvdauthor-users@lists.sourceforge.net)
AC_CONFIG_HEADERS(src/config.h)
AC_CONFIG_AUX_DIR(autotools)
@@ -45,35 +45,30 @@ if test "$enable_shared" = 'no'; then
config_static='--static'
fi
-usemagick=0
-
-AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config])
-if test -n "$MAGICKCONFIG"; then
- ac_save_CPPFLAGS="$CPPFLAGS"
- ac_save_LIBS="$LIBS"
- MAGICK_CPPFLAGS="`$MAGICKCONFIG --cppflags`"
- MAGICK_LIBS="`$MAGICKCONFIG --ldflags` `$MAGICKCONFIG --libs`"
- CPPFLAGS="$CPPFLAGS $MAGICK_CPPFLAGS"
- LIBS="$MAGICK_LIBS $LIBS"
- AC_CHECK_FUNC(ExportImagePixels, usemagick=1, AC_MSG_NOTICE([ImageMagick does not support the function
- ExportImagePixels. Please upgrade to ImageMagick 5.5.7 or newer]))
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIBS="$ac_save_LIBS"
- if test "$usemagick" = 1; then
- AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available])
- fi
+use_imagemagick=0
+use_graphicsmagick=0
+AC_ARG_WITH([imagemagick], AS_HELP_STRING([--with-imagemagick], [Use ImageMagick to augment image import formats]), [if test "$withval" != "no"; then use_imagemagick=1; fi])
+AC_ARG_WITH([graphicsmagick], AS_HELP_STRING([--with-graphicsmagick], [Use GraphicsMagick to augment image import formats]), [if test "$withval" != "no"; then use_graphicsmagick=1; fi])
+if test "$use_imagemagick" = 1 && test "$use_graphicsmagick" = 1; then
+ AC_MSG_ERROR([cannot specify both --with-imagemagick and --with-graphicsmagick], 1)
fi
-if test "$usemagick" != 1; then
- PKG_CHECK_MODULES([MAGICK], [GraphicsMagick], usemagick=1; [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [:])
+if test "$use_imagemagick" = 1; then
+ PKG_CHECK_MODULES([IMAGEMAGICK], [ImageMagick >= 5.5.7], [AC_DEFINE(HAVE_MAGICK, 1, [Whether the ImageMagick libraries are available])], [AC_MSG_ERROR([ImageMagick not available])])
+ MAGICK_CFLAGS="$IMAGEMAGICK_CFLAGS"
+ MAGICK_LIBS="$IMAGEMAGICK_LIBS"
fi
-
-if test "$usemagick" != 1; then
- MAGICK_CPPFLAGS="$LIBPNG_CFLAGS"
+if test "$use_graphicsmagick" = 1; then
+ PKG_CHECK_MODULES([GRAPHICSMAGICK], [GraphicsMagick], [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [AC_MSG_ERROR([GraphicsMagick not available])])
+ MAGICK_CFLAGS="$GRAPHICSMAGICK_CFLAGS"
+ MAGICK_LIBS="$GRAPHICSMAGICK_LIBS"
+fi
+if test "$use_imagemagick" != 1 && test "$use_graphicsmagick" != 1; then
+ MAGICK_CFLAGS="$LIBPNG_CFLAGS"
MAGICK_LIBS="$LIBPNG_LIBS"
fi
-AC_SUBST(MAGICK_CPPFLAGS)
+AC_SUBST(MAGICK_CFLAGS)
AC_SUBST(MAGICK_LIBS)
PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], [AC_DEFINE(HAVE_FONTCONFIG, 1, [whether Fontconfig is available])], [:])
@@ -84,10 +79,8 @@ PKG_CHECK_MODULES([FRIBIDI], [fribidi], [AC_DEFINE(HAVE_FRIBIDI, 1, [whether Fri
AC_SUBST(FRIBIDI_CFLAGS)
AC_SUBST(FRIBIDI_LIBS)
-AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config])
-if test -n "$FREETYPECONFIG"; then
- FREETYPE_CPPFLAGS="`$FREETYPECONFIG --cflags`"
- FREETYPE_LIBS="`$FREETYPECONFIG --libs $config_static`"
+PKG_CHECK_MODULES(FREETYPE, [freetype2],[
+ FREETYPE_CPPFLAGS="$FREETYPE_CFLAGS"
AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available])
ac_save_CPPFLAGS="$CPPFLAGS"
@@ -96,9 +89,9 @@ if test -n "$FREETYPECONFIG"; then
CPPFLAGS="$ac_save_CPPFLAGS"
AC_SUBST(FREETYPE_CPPFLAGS)
AC_SUBST(FREETYPE_LIBS)
-else
+ ],
AC_MSG_ERROR([freetype not found])
-fi
+)
AC_ARG_ENABLE([default-video-format],
diff --git a/src/Makefile.am b/src/Makefile.am
index c7f89a9..5ef90c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ endif
nodist_bin_SCRIPTS = dvddirdel
AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \
- @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
+ @XML_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
AM_CFLAGS = -Wall
dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \
+15 -7
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>dvdauthor</Name>
@@ -12,19 +12,20 @@
<IsA>app:console</IsA>
<Summary>A simple DVD tool</Summary>
<Description>dvdauthor is a set of simple tools to help you author a DVD.</Description>
<Archive sha1sum="a9636d165bf546e3e2b25b7397c33dbfa2895e6a" type="targz">https://sourceforge.net/projects/dvdauthor/files/dvdauthor/0.7.1/dvdauthor-0.7.1.tar.gz</Archive>
<Archive sha1sum="0e605642140576bfb3e963414d77630d1c073a51" type="targz">https://sourceforge.net/projects/dvdauthor/files/dvdauthor-0.7.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>libpng-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>fribidi-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency>libdvdread-devel</Dependency>
<Dependency>imagemagick-devel</Dependency>
<Dependency>GraphicsMagick-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">dvdauthor-fix-build.patch</Patch>
<!-- <Patch level="1">arch/imagemagick7.patch</Patch> -->
<Patch level="1">backport_from_git.patch</Patch>
</Patches>
</Source>
@@ -49,6 +50,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-09-27</Date>
<Version>0.7.2</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>wascheme@tuta.io</Email>
</Update>
<Update release="4">
<Date>2020-03-05</Date>
<Version>0.7.1</Version>
+3 -20
View File
@@ -1,13 +1,10 @@
#!/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 https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import qt5
#from pisi.actionsapi import pisitools
# if pisi can't find source directory, see /var/pisi/ktageditor/work/ and:
# WorkDir="ktageditor-"+ get.srcVERSION() +"/sub_project_dir/"
from pisi.actionsapi import pisitools, qt5
def setup():
qt5.configure()
@@ -18,17 +15,3 @@ def build():
def install():
qt5.install()
# Take a look at the source folder for these file as documentation.
# pisitools.dodoc("AUTHORS", "BUGS", "ChangeLog", "COPYING", "README")
# If there is no install rule for a runnable binary, you can
# install it to binary directory.
# pisitools.dobin("ktageditor")
# You can use these as variables, they will replace GUI values before build.
# Package Name : ktageditor
# Version : 0.2.0
# Summary : KTag Editor is an Audio tag editor developed in Qt5 framework.
# For more information, you can look at the Actions API
# from the Help menu and toolbar.
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>ktageditor</Name>
+2 -2
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>faac</Name>
<Homepage>https://www.audiocoding.com/</Homepage>
<Homepage>https://github.com/knik0/faac</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
+1 -1
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>faad2</Name>
<Homepage>https://www.audiocoding.com/</Homepage>
<Homepage>https://github.com/knik0/faad2</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
+1
View File
@@ -19,6 +19,7 @@
</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>ccache</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libmtp-devel</Dependency>
+10 -12
View File
@@ -1,9 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Copyright 2009 TUBITAK/UEKAE
# Licensed under the GNU General Public License, version 2.
# See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
# Licensed under the GNU General Public License, version 3.
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
@@ -12,19 +11,18 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++")
cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \
-DOCLICD_COMPAT=1")
shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++")
cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \
-DOCLICD_COMPAT=1")
def build():
cmaketools.make()
def install():
autotools.rawInstall("DESTDIR=%s" %get.installDIR())
pisitools.remove("/usr/include/CL/*")
pisitools.removeDir("/usr/include")
+28 -31
View File
@@ -1,19 +1,19 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>beignet</Name>
<Homepage>https://01.org/beignet/</Homepage>
<Homepage>https://www.freedesktop.org/wiki/Software/Beignet/</Homepage>
<Packager>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<Summary>Open source implementation of the OpenCL for Intel GPUs</Summary>
<Description>Open source implementation of the OpenCL for Intel GPUs</Description>
<Archive sha1sum="c3a689ec504c2d28e856a62bf97e5abb0da4a797" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/beignet-1.3.2_12.tar.xz</Archive>
<BuildDependencies>
<Summary>Open source implementation of the OpenCL for Intel GPUs</Summary>
<Description>Open source implementation of the OpenCL for Intel GPUs</Description>
<Archive sha1sum="c3a689ec504c2d28e856a62bf97e5abb0da4a797" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/beignet-1.3.2_12.tar.xz</Archive>
<BuildDependencies>
<Dependency>libX11-devel</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>libXfixes-devel</Dependency>
@@ -24,47 +24,44 @@
<Dependency>opencl-icd-devel</Dependency>
<Dependency>cmake</Dependency>
<Dependency>python3-devel</Dependency>
</BuildDependencies>
<Patches>
</BuildDependencies>
<Patches>
<Patch level="0">llvm8.patch</Patch>
<Patch level="0">llvm9.patch</Patch>
<Patch level="1">llvm10.patch</Patch>
</Patches>
</Patches>
</Source>
<Package>
<Name>beignet</Name>
<RuntimeDependencies>
<Dependency>libX11</Dependency>
<Dependency>libXext</Dependency>
<Dependency>libXfixes</Dependency>
<Dependency>llvm-clang</Dependency>
<Dependency>opencl-icd</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libdrm</Dependency>
<Dependency>libdrm-intel</Dependency>
<Dependency>llvm</Dependency>
<Dependency>llvm-libs</Dependency>
</RuntimeDependencies>
<Files>
<Name>beignet</Name>
<RuntimeDependencies>
<Dependency>libX11</Dependency>
<Dependency>libXext</Dependency>
<Dependency>libXfixes</Dependency>
<Dependency>llvm-clang</Dependency>
<Dependency>opencl-icd</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libdrm</Dependency>
<Dependency>libdrm-intel</Dependency>
<Dependency>llvm</Dependency>
<Dependency>llvm-libs</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Files>
</Package>
<History>
<Update release="1">
<Date>2020-01-11</Date>
<Version>1.3.2_12</Version>
<Comment>First Release</Comment>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
</History>
</PISI>