Merge branch 'master' of github.com:pisilinux/main
This commit is contained in:
@@ -97,7 +97,7 @@
|
||||
</Package>
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="10">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="17">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="17">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="17">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="17">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -142,7 +142,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="10">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="12">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -85,9 +85,9 @@ It supports email, address books, calendars, tasks, news feeds and much more.</D
|
||||
|
||||
<History>
|
||||
<Update release="10">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="17">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="13">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="17">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
|
||||
<History>
|
||||
<Update release="16">
|
||||
<Date>2018-04-23</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>5.45.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
<Dependency versionFrom="0.4.0">lxqt-build-tools</Dependency>
|
||||
<Dependency>menu-cache-devel</Dependency>
|
||||
<Dependency>libexif-devel</Dependency>
|
||||
<Dependency>libfm-extra-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
<Package>
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
<Dependency>binutils</Dependency>
|
||||
<Dependency>qt5-x11extras-devel</Dependency>
|
||||
<Dependency>qt5-linguist</Dependency>
|
||||
<Dependency>libfm-extra-devel</Dependency>
|
||||
<Dependency>libexif-devel</Dependency>
|
||||
<Dependency>libX11-devel</Dependency>
|
||||
<Dependency versionFrom="0.12.0">libfm-qt-devel</Dependency>
|
||||
@@ -46,6 +47,7 @@
|
||||
<Dependency>libexif</Dependency>
|
||||
<Dependency>qt5-svg</Dependency>
|
||||
<Dependency>libfm-qt</Dependency>
|
||||
<Dependency>libfm-extra</Dependency>
|
||||
<Dependency>qt5-base</Dependency>
|
||||
<Dependency>libXfixes</Dependency>
|
||||
<Dependency>qt5-x11extras</Dependency>
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
<Update release="1">
|
||||
<Date>2018-04-26</Date>
|
||||
<Version>0.12.0</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Comment>First release.</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
<Dependency>cmake</Dependency>
|
||||
<Dependency>kwindowsystem-devel</Dependency>
|
||||
<Dependency>libdbusmenu-qt-devel</Dependency>
|
||||
<Dependency>libfm-extra-devel</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency versionFrom="0.12.0">liblxqt-devel</Dependency>
|
||||
<Dependency>libqtxdg-devel</Dependency>
|
||||
@@ -32,6 +33,7 @@
|
||||
<Name>lxqt-qtplugin</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>libfm-extra</Dependency>
|
||||
<Dependency>qt5-base</Dependency>
|
||||
<Dependency>libdbusmenu-qt</Dependency>
|
||||
<Dependency>libqtxdg</Dependency>
|
||||
@@ -45,7 +47,7 @@
|
||||
<Update release="1">
|
||||
<Date>2018-04-23</Date>
|
||||
<Version>0.12.0</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Comment>First release.</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
<Dependency>glib2-devel</Dependency>
|
||||
<Dependency>libfm-devel</Dependency>
|
||||
<Dependency>libfm-qt-devel</Dependency>
|
||||
<Dependency>libfm-extra-devel</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency versionFrom="0.12.0">liblxqt-devel</Dependency>
|
||||
<Dependency>libqtxdg-devel</Dependency>
|
||||
@@ -38,6 +39,7 @@
|
||||
<RuntimeDependencies>
|
||||
<Dependency>glib2</Dependency>
|
||||
<Dependency>libfm</Dependency>
|
||||
<Dependency>libfm-extra</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>libxcb</Dependency>
|
||||
<Dependency>libfm-qt</Dependency>
|
||||
@@ -64,7 +66,7 @@
|
||||
<Update release="1">
|
||||
<Date>2018-04-23</Date>
|
||||
<Version>0.12.0</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Comment>First release.</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
diff -Nuar a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h
|
||||
--- a/src/3rdparty/chromium/media/base/decoder_buffer.h 2017-11-08 22:13:31.000000000 +0300
|
||||
+++ b/src/3rdparty/chromium/media/base/decoder_buffer.h 2018-04-26 15:52:44.678483902 +0300
|
||||
@@ -37,7 +37,7 @@
|
||||
: public base::RefCountedThreadSafe<DecoderBuffer> {
|
||||
public:
|
||||
enum {
|
||||
- kPaddingSize = 32,
|
||||
+ kPaddingSize = 64,
|
||||
#if defined(ARCH_CPU_ARM_FAMILY)
|
||||
kAlignmentSize = 16
|
||||
#else
|
||||
diff -Nuar a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc
|
||||
--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc 2017-11-08 22:13:31.000000000 +0300
|
||||
+++ b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc 2018-04-26 15:56:51.217466113 +0300
|
||||
@@ -30,10 +30,10 @@
|
||||
|
||||
} // namespace
|
||||
|
||||
-// Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
|
||||
+// Why AV_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
|
||||
// padded. Check here to ensure FFmpeg only receives data padded to its
|
||||
// specifications.
|
||||
-static_assert(DecoderBuffer::kPaddingSize >= FF_INPUT_BUFFER_PADDING_SIZE,
|
||||
+static_assert(DecoderBuffer::kPaddingSize >= AV_INPUT_BUFFER_PADDING_SIZE,
|
||||
"DecoderBuffer padding size does not fit ffmpeg requirement");
|
||||
|
||||
// Alignment requirement by FFmpeg for input and output buffers. This need to
|
||||
@@ -429,11 +429,11 @@
|
||||
} else {
|
||||
codec_context->extradata_size = config.extra_data().size();
|
||||
codec_context->extradata = reinterpret_cast<uint8_t*>(
|
||||
- av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE));
|
||||
+ av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE));
|
||||
memcpy(codec_context->extradata, &config.extra_data()[0],
|
||||
config.extra_data().size());
|
||||
memset(codec_context->extradata + config.extra_data().size(), '\0',
|
||||
- FF_INPUT_BUFFER_PADDING_SIZE);
|
||||
+ AV_INPUT_BUFFER_PADDING_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -561,11 +561,11 @@
|
||||
} else {
|
||||
codec_context->extradata_size = config.extra_data().size();
|
||||
codec_context->extradata = reinterpret_cast<uint8_t*>(
|
||||
- av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE));
|
||||
+ av_malloc(config.extra_data().size() + AV_INPUT_BUFFER_PADDING_SIZE));
|
||||
memcpy(codec_context->extradata, &config.extra_data()[0],
|
||||
config.extra_data().size());
|
||||
memset(codec_context->extradata + config.extra_data().size(), '\0',
|
||||
- FF_INPUT_BUFFER_PADDING_SIZE);
|
||||
+ AV_INPUT_BUFFER_PADDING_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
diff -Nuar a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc
|
||||
--- a/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc 2017-11-08 22:13:31.000000000 +0300
|
||||
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_audio_decoder.cc 2018-04-26 15:58:11.213460341 +0300
|
||||
@@ -53,7 +53,7 @@
|
||||
// AVCodecContext.opaque to get the object reference in order to call
|
||||
// GetAudioBuffer() to do the actual allocation.
|
||||
static int GetAudioBuffer(struct AVCodecContext* s, AVFrame* frame, int flags) {
|
||||
- DCHECK(s->codec->capabilities & CODEC_CAP_DR1);
|
||||
+ DCHECK(s->codec->capabilities & AV_CODEC_CAP_DR1);
|
||||
DCHECK_EQ(s->codec_type, AVMEDIA_TYPE_AUDIO);
|
||||
|
||||
// Since this routine is called by FFmpeg when a buffer is required for audio
|
||||
diff -Nuar a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc
|
||||
--- a/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc 2017-11-08 22:13:31.000000000 +0300
|
||||
+++ b/src/3rdparty/chromium/media/filters/ffmpeg_video_decoder.cc 2018-04-26 16:01:18.758446808 +0300
|
||||
@@ -415,12 +415,11 @@
|
||||
codec_context_->thread_type =
|
||||
FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME);
|
||||
codec_context_->opaque = this;
|
||||
- codec_context_->flags |= CODEC_FLAG_EMU_EDGE;
|
||||
codec_context_->get_buffer2 = GetVideoBufferImpl;
|
||||
codec_context_->refcounted_frames = 1;
|
||||
|
||||
if (decode_nalus_)
|
||||
- codec_context_->flags2 |= CODEC_FLAG2_CHUNKS;
|
||||
+ codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
|
||||
|
||||
AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
|
||||
if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
|
||||
@@ -70,7 +70,7 @@
|
||||
<Dependency>git</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- <Patch level="1">qtwebengine-5.7.0-icu58.patch</Patch> -->
|
||||
<Patch level="1">qtwebengine-ffmpeg4.patch</Patch>
|
||||
<Patch level="1">qtwebengine-5.9.3-icu-60-build.patch</Patch>
|
||||
<Patch level="1">harmony-fix.diff</Patch>
|
||||
</Patches>
|
||||
@@ -157,6 +157,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>5.9.3</Version>
|
||||
<Comment>Release bump</Comment>
|
||||
<Name>Kamil Atlı</Name>
|
||||
<Email>suvari@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2018-03-01</Date>
|
||||
<Version>5.9.3</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>CD/DVD burning application for KDE4</Summary>
|
||||
<Description>K3b provides a comfortable user interface to perform most CD/DVD burning tasks. While the experienced user can take influence in all steps of the burning process the beginner may find comfort in the automatic settings and the reasonable k3b defaults which allow a quick start.</Description>
|
||||
<Archive sha1sum="1a7fd5f84fdcd3e22009fee7395c9fbc7b295d8e" type="tarxz">https://download.kde.org/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz</Archive>
|
||||
<Archive sha1sum="2e3403e8e89371325e845c5aa39cf42156f86dfa" type="tarxz">https://download.kde.org/stable/applications/18.04.0/src/k3b-18.04.0.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>extra-cmake-modules</Dependency>
|
||||
<Dependency>karchive-devel</Dependency>
|
||||
@@ -107,6 +107,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="7">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>18.04.0</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2018-03-24</Date>
|
||||
<Version>17.12.3</Version>
|
||||
|
||||
@@ -16,7 +16,7 @@ def setup():
|
||||
shelltools.cd("..")
|
||||
shelltools.makedirs("cmake-make")
|
||||
shelltools.cd("cmake-make")
|
||||
shelltools.system("cmake ../blender-2.79 \
|
||||
shelltools.system("cmake ../blender-2.79b \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2 \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
|
||||
index e9eea195208..84aea330313 100644
|
||||
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
|
||||
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
|
||||
@@ -264,9 +264,9 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(boost::shared_ptr<AUD_Buffer> buffer) :
|
||||
m_membuffer(buffer),
|
||||
m_membufferpos(0)
|
||||
{
|
||||
- m_membuf = reinterpret_cast<data_t*>(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE));
|
||||
+ m_membuf = reinterpret_cast<data_t*>(av_malloc(AV_INPUT_BUFFER_MIN_SIZE + AV_INPUT_BUFFER_PADDING_SIZE));
|
||||
|
||||
- m_aviocontext = avio_alloc_context(m_membuf, FF_MIN_BUFFER_SIZE, 0, this,
|
||||
+ m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE, 0, this,
|
||||
read_packet, NULL, seek_packet);
|
||||
|
||||
if(!m_aviocontext)
|
||||
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
|
||||
index 3f95ac7a4da..2c2f0916406 100644
|
||||
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
|
||||
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
|
||||
@@ -163,7 +163,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs,
|
||||
try
|
||||
{
|
||||
if(m_formatCtx->oformat->flags & AVFMT_GLOBALHEADER)
|
||||
- m_codecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
|
||||
+ m_codecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
|
||||
|
||||
AVCodec* codec = avcodec_find_encoder(m_codecCtx->codec_id);
|
||||
if(!codec)
|
||||
@@ -185,11 +185,11 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs,
|
||||
if(avcodec_open2(m_codecCtx, codec, NULL))
|
||||
AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
|
||||
|
||||
- m_output_buffer.resize(FF_MIN_BUFFER_SIZE);
|
||||
+ m_output_buffer.resize(AV_INPUT_BUFFER_MIN_SIZE);
|
||||
int samplesize = AUD_MAX(AUD_SAMPLE_SIZE(m_specs), AUD_DEVICE_SAMPLE_SIZE(m_specs));
|
||||
|
||||
if(m_codecCtx->frame_size <= 1) {
|
||||
- m_input_size = FF_MIN_BUFFER_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
|
||||
+ m_input_size = AV_INPUT_BUFFER_MIN_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels;
|
||||
m_input_buffer.resize(m_input_size * samplesize);
|
||||
}
|
||||
else
|
||||
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
|
||||
index d7fcd896e11..9e82df17dce 100644
|
||||
--- a/source/blender/blenkernel/intern/writeffmpeg.c
|
||||
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
|
||||
@@ -619,8 +619,6 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
|
||||
c->rc_buffer_aggressivity = 1.0;
|
||||
#endif
|
||||
|
||||
- c->me_method = ME_EPZS;
|
||||
-
|
||||
codec = avcodec_find_encoder(c->codec_id);
|
||||
if (!codec)
|
||||
return NULL;
|
||||
@@ -682,14 +680,14 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int
|
||||
)
|
||||
{
|
||||
PRINT("Using global header\n");
|
||||
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
|
||||
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
|
||||
}
|
||||
|
||||
/* Determine whether we are encoding interlaced material or not */
|
||||
if (rd->mode & R_FIELDS) {
|
||||
PRINT("Encoding interlaced video\n");
|
||||
- c->flags |= CODEC_FLAG_INTERLACED_DCT;
|
||||
- c->flags |= CODEC_FLAG_INTERLACED_ME;
|
||||
+ c->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
|
||||
+ c->flags |= AV_CODEC_FLAG_INTERLACED_ME;
|
||||
}
|
||||
|
||||
/* xasp & yasp got float lately... */
|
||||
@@ -779,7 +777,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int
|
||||
}
|
||||
|
||||
if (of->oformat->flags & AVFMT_GLOBALHEADER) {
|
||||
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
|
||||
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
|
||||
}
|
||||
|
||||
set_ffmpeg_properties(rd, c, "audio", &opts);
|
||||
@@ -798,14 +796,14 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int
|
||||
st->codec->time_base.den = st->codec->sample_rate;
|
||||
|
||||
#ifndef FFMPEG_HAVE_ENCODE_AUDIO2
|
||||
- context->audio_outbuf_size = FF_MIN_BUFFER_SIZE;
|
||||
+ context->audio_outbuf_size = AV_INPUT_BUFFER_MIN_SIZE;
|
||||
#endif
|
||||
|
||||
if (c->frame_size == 0)
|
||||
// used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD))
|
||||
// not sure if that is needed anymore, so let's try out if there are any
|
||||
// complaints regarding some ffmpeg versions users might have
|
||||
- context->audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels;
|
||||
+ context->audio_input_samples = AV_INPUT_BUFFER_MIN_SIZE * 8 / c->bits_per_coded_sample / c->channels;
|
||||
else {
|
||||
context->audio_input_samples = c->frame_size;
|
||||
#ifndef FFMPEG_HAVE_ENCODE_AUDIO2
|
||||
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
|
||||
index eaf4dfd84b4..9c2f42feb52 100644
|
||||
--- a/source/blender/imbuf/intern/indexer.c
|
||||
+++ b/source/blender/imbuf/intern/indexer.c
|
||||
@@ -537,7 +537,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg(
|
||||
av_opt_set_int(rv->c, "qmax", ffmpeg_quality, 0);
|
||||
|
||||
if (rv->of->flags & AVFMT_GLOBALHEADER) {
|
||||
- rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER;
|
||||
+ rv->c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
|
||||
}
|
||||
|
||||
if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {
|
||||
@@ -13,7 +13,7 @@
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>3D modeling, animation, rendering and post-production application</Summary>
|
||||
<Description>blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback.</Description>
|
||||
<Archive sha1sum="6ab865e09a826b93d70302114c189403938d1692" type="targz">http://download.blender.org/source/blender-2.79.tar.gz</Archive>
|
||||
<Archive sha1sum="4fd307ccfd1d6df5cc1898009712d4b1ae35430f" type="targz">http://download.blender.org/source/blender-2.79b.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>boost-devel</Dependency>
|
||||
<Dependency>cmake</Dependency> -->
|
||||
@@ -48,8 +48,8 @@
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!--<Patch level="1">blender-2.67b-rna.patch</Patch>-->
|
||||
<!--<Patch level="1">06-blender-2.68-fix-install-rules.patch</Patch>
|
||||
<Patch level="1">ffmpeg3.patch</Patch>-->
|
||||
<!--<Patch level="1">06-blender-2.68-fix-install-rules.patch</Patch>-->
|
||||
<Patch level="1">ffmpeg4.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -104,6 +104,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>2.79</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2018-03-24</Date>
|
||||
<Version>2.79</Version>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>A dynamic, any to any, pixel format translation library</Summary>
|
||||
<Description>babl is a library that allows converting between different methods of storing pixels known as pixel formats that have with different bitdepths and other data representations, color models and component permutations.</Description>
|
||||
<Archive sha1sum="a22cbbbd16b730ab7ae030bdf86dab1ee69b448b" type="tarbz2">https://download.gimp.org/pub/babl/0.1/babl-0.1.38.tar.bz2</Archive>
|
||||
<Archive sha1sum="33c77797bcabc1064b28f7f953db813468424147" type="tarbz2">https://download.gimp.org/pub/babl/0.1/babl-0.1.46.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<!-- For rsvg utility -->
|
||||
<!--<Dependency>librsvg</Dependency>-->
|
||||
@@ -43,6 +43,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>0.1.46</Version>
|
||||
<Comment>Version Bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2017-12-21</Date>
|
||||
<Version>0.1.38</Version>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>A graph based image processing framework</Summary>
|
||||
<Description>gegl (Generic Graphics Library) provides infrastructure to do demand based cached non destructive image editing on larger than RAM buffers. Through babl it provides support for a wide range of color models and pixel storage formats for input and output.</Description>
|
||||
<Archive sha1sum="065ab41d3f828bebae81eb103c33b2ad98046a9e" type="tarbz2">https://download.gimp.org/pub/gegl/0.3/gegl-0.3.26.tar.bz2</Archive>
|
||||
<Archive sha1sum="fa4c402fbdf896d7a0559403bbd5abc9e668998a" type="tarbz2">https://download.gimp.org/pub/gegl/0.3/gegl-0.3.34.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<!--<Dependency>SuiteSparse-devel</Dependency>-->
|
||||
<!--<Dependency>libopenraw-devel</Dependency>-->
|
||||
@@ -104,6 +104,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="6">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>0.3.34</Version>
|
||||
<Comment>Version Bump</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2018-02-13</Date>
|
||||
<Version>0.3.26</Version>
|
||||
|
||||
@@ -84,6 +84,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="4">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>0.2.0</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2018-02-13</Date>
|
||||
<Version>0.2.0</Version>
|
||||
|
||||
@@ -92,6 +92,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="4">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>1.7.9</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2017-04-24</Date>
|
||||
<Version>1.7.9</Version>
|
||||
|
||||
@@ -15,7 +15,9 @@ def setup():
|
||||
|
||||
shelltools.cd("build")
|
||||
cmaketools.configure("-DUSE_QT=0 \
|
||||
-DUSE_PYTHON=ON \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
|
||||
-DUSE_OCIO= OFF \
|
||||
-DUSE_OPENSSL:BOOL=TRUE \
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
diff -Nuar a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp
|
||||
--- a/src/ffmpeg.imageio/ffmpeginput.cpp 2018-03-01 08:49:23.000000000 +0300
|
||||
+++ b/src/ffmpeg.imageio/ffmpeginput.cpp 2018-04-27 01:05:14.877091949 +0300
|
||||
@@ -124,6 +124,15 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+
|
||||
+// Changes for ffmpeg 4.0
|
||||
+#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))
|
||||
+
|
||||
+#if USE_FFMPEG_4_0
|
||||
+# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
#include <boost/thread/once.hpp>
|
||||
|
||||
#include <OpenImageIO/imageio.h>
|
||||
@@ -136,12 +145,12 @@
|
||||
public:
|
||||
FFmpegInput ();
|
||||
virtual ~FFmpegInput();
|
||||
- virtual const char *format_name (void) const { return "FFmpeg movie"; }
|
||||
- virtual bool open (const std::string &name, ImageSpec &spec);
|
||||
- virtual bool close (void);
|
||||
- virtual int current_subimage (void) const { return m_subimage; }
|
||||
- virtual bool seek_subimage (int subimage, int miplevel, ImageSpec &newspec);
|
||||
- virtual bool read_native_scanline (int y, int z, void *data);
|
||||
+ virtual const char *format_name (void) const override { return "FFmpeg movie"; }
|
||||
+ virtual bool open (const std::string &name, ImageSpec &spec) override;
|
||||
+ virtual bool close (void) override;
|
||||
+ virtual int current_subimage (void) const override { return m_subimage; }
|
||||
+ virtual bool seek_subimage (int subimage, int miplevel, ImageSpec &newspec) override;
|
||||
+ virtual bool read_native_scanline (int y, int z, void *data) override;
|
||||
void read_frame(int pos);
|
||||
#if 0
|
||||
const char *metadata (const char * key);
|
||||
@@ -12,10 +12,12 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Library for reading and writing images</Summary>
|
||||
<Description>OpenImageIO is a library for reading and writing images, and a bunch of related classes, utilities, and applications.</Description>
|
||||
<Archive sha1sum="96f7f96bb53dda71ceb850472b3293072cd9c31b" type="targz">https://github.com/OpenImageIO/oiio/archive/Release-1.7.12.tar.gz</Archive>
|
||||
<Archive sha1sum="cd2a8497f1b5e333e19759a0abe1127910ba1426" type="targz">https://github.com/OpenImageIO/oiio/archive/Release-1.8.9.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>cmake</Dependency>
|
||||
<Dependency>boost-devel</Dependency>
|
||||
<Dependency>boost-python</Dependency>
|
||||
<Dependency>openssl-devel</Dependency>
|
||||
<Dependency>openexr-devel</Dependency>
|
||||
<Dependency>ilmbase-devel</Dependency>
|
||||
<Dependency>glew-devel</Dependency>
|
||||
@@ -31,9 +33,12 @@
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
<Dependency>jasper-devel</Dependency>
|
||||
<Dependency>libraw-devel</Dependency>
|
||||
<Dependency>openjpeg-devel</Dependency>
|
||||
<Dependency>openjpeg2-devel</Dependency>
|
||||
<Dependency>libjpeg-turbo-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">ffmpeginput.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -43,9 +48,10 @@
|
||||
<Dependency>webp</Dependency>
|
||||
<Dependency>boost</Dependency>
|
||||
<Dependency>opencv</Dependency>
|
||||
<Dependency>openssl</Dependency>
|
||||
<Dependency>giflib</Dependency>
|
||||
<Dependency>ilmbase</Dependency>
|
||||
<Dependency>openjpeg</Dependency>
|
||||
<Dependency>openjpeg2</Dependency>
|
||||
<Dependency>openexr-libs</Dependency>
|
||||
<Dependency>libjpeg-turbo</Dependency>
|
||||
<Dependency>libraw</Dependency>
|
||||
@@ -55,6 +61,7 @@
|
||||
<Dependency>python</Dependency>
|
||||
<Dependency>freetype</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>boost-python</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
@@ -90,6 +97,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="7">
|
||||
<Date>2018-04-26</Date>
|
||||
<Version>1.8.9</Version>
|
||||
<Comment>Rebuild ffmpeg</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2018-03-23</Date>
|
||||
<Version>1.7.12</Version>
|
||||
|
||||
@@ -47,6 +47,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="6">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>1.4.2</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2018-03-22</Date>
|
||||
<Version>1.4.2</Version>
|
||||
|
||||
@@ -151,6 +151,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>2.9.0</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2018-04-11</Date>
|
||||
<Version>2.9.0</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<Icon>cantata</Icon>
|
||||
<Summary>Qt5 client for the music player daemon </Summary>
|
||||
<Description>Cantata is a graphical client for MPD</Description>
|
||||
<Archive sha1sum="e4ebd1777700cb3406725d905073dd6ea1382b4d" type="tarbz2">https://github.com/CDrummond/cantata/releases/download/v2.2.0/cantata-2.2.0.tar.bz2</Archive>
|
||||
<Archive sha1sum="d4a7f6b4ce9368e5e863ab0133dd49f8cf9e5d43" type="tarbz2">https://github.com/CDrummond/cantata/releases/download/v2.3.0/cantata-2.3.0.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>qt5-base-devel</Dependency>
|
||||
<Dependency>qt5-svg-devel</Dependency>
|
||||
@@ -45,7 +45,7 @@
|
||||
<Dependency>taglib-extras-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>4da7a912.patch</Patch>
|
||||
<!--Patch>4da7a912.patch</Patch-->
|
||||
</Patches>
|
||||
</Source>
|
||||
<Package>
|
||||
@@ -72,10 +72,12 @@
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="config">/etc/dbus-1</Path>
|
||||
<Path fileType="doc">/usr/share/doc/</Path>
|
||||
<Path fileType="data">/usr/share/icons</Path>
|
||||
<Path fileType="data">/usr/share/pixmaps</Path>
|
||||
<Path fileType="data">/usr/share/cantata</Path>
|
||||
<Path fileType="data">/usr/share/dbus-1</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="locale">/usr/share/locale</Path>
|
||||
<Path fileType="data">/usr/share/applications</Path>
|
||||
@@ -83,6 +85,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="4">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>2.3.0</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2018-02-18</Date>
|
||||
<Version>2.2.0</Version>
|
||||
|
||||
@@ -97,6 +97,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>1.3.1</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2018-03-22</Date>
|
||||
<Version>1.3.1</Version>
|
||||
|
||||
@@ -13,8 +13,9 @@
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>An audio-player, written with Qt5 library</Summary>
|
||||
<Description>Qmmp is an audio-player, written with Qt5 library. It's similar to Winamp or Xmms. Also supports Xmms and Winamp skins. qmmp-skins package in Contrib repository is recommended, too.</Description>
|
||||
<Archive sha1sum="cef232071966b833d5a935666837dc9849766fb6" type="tarbz2">http://qmmp.ylsoftware.com/files/qmmp-1.1.8.tar.bz2</Archive>
|
||||
<Archive sha1sum="d51bdf6bf2c970de94823ecc0cd404b24abb93c2" type="tarbz2">http://qmmp.ylsoftware.com/files/qmmp-1.2.1.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>qt5-multimedia-devel</Dependency>
|
||||
<Dependency>qt5-base-devel</Dependency>
|
||||
<Dependency>libX11-devel</Dependency>
|
||||
<Dependency>qt5-x11extras-devel</Dependency>
|
||||
@@ -48,6 +49,7 @@
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>qt5-x11extras</Dependency>
|
||||
<Dependency>qt5-multimedia</Dependency>
|
||||
<Dependency>libsamplerate</Dependency>
|
||||
<Dependency>wavpack</Dependency>
|
||||
<Dependency>flac</Dependency>
|
||||
@@ -89,6 +91,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="6">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>1.2.1</Version>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Yusuf Aydemir</Name>
|
||||
<Email>yusuf.aydemir@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2017-04-24</Date>
|
||||
<Version>1.1.8</Version>
|
||||
|
||||
@@ -79,6 +79,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="4">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>14.4.2</Version>
|
||||
<Comment>Release Bump</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2017-02-18</Date>
|
||||
<Version>14.4.2</Version>
|
||||
|
||||
@@ -119,9 +119,9 @@
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2018-04-25</Date>
|
||||
<Date>2018-04-26</Date>
|
||||
<Version>6.6.0</Version>
|
||||
<Comment>Rebuild with new toolchain</Comment>
|
||||
<Comment>Rebuild ffmpeg</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
|
||||
@@ -57,10 +57,10 @@ def setup():
|
||||
def build():
|
||||
autotools.make()
|
||||
autotools.make('tools/qt-faststart')
|
||||
#autotools.make("doc/ffmpeg-utils.1") üst sürümde kullan
|
||||
autotools.make("doc/ff{mpeg,play,server}.1")
|
||||
autotools.make("doc/ff{mpeg,play}.1")
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s install-man" % get.installDIR())
|
||||
pisitools.dobin("tools/qt-faststart")
|
||||
|
||||
pisitools.dodoc("Changelog", "README.md", "LICENSE.md", "COPYING*")
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>A command-line tool to record, convert and stream audio and video</Summary>
|
||||
<Description>FFmpeg is a complete solution to record, convert and stream audio and video.</Description>
|
||||
<Archive sha1sum="baef74d93683c6b2029ac36b900732795216e066" type="tarxz">http://ffmpeg.org/releases/ffmpeg-3.4.2.tar.xz</Archive>
|
||||
<Archive sha1sum="cb2d672a0c08607658175fc21e3d7d10e82a52d4" type="targz">https://ffmpeg.org/releases/ffmpeg-4.0.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>freetype-devel</Dependency>
|
||||
<Dependency>faac-devel</Dependency>
|
||||
@@ -23,7 +23,7 @@
|
||||
<Dependency>x264-devel</Dependency>
|
||||
<Dependency>x265-devel</Dependency>
|
||||
<Dependency>libva-devel</Dependency>
|
||||
<Dependency>libsdl-devel</Dependency>
|
||||
<Dependency>libsdl2-devel</Dependency>
|
||||
<Dependency>libvpx-devel</Dependency>
|
||||
<Dependency>libass-devel</Dependency>
|
||||
<Dependency>libopus-devel</Dependency>
|
||||
@@ -38,7 +38,8 @@
|
||||
<Dependency>opencore-amr-devel</Dependency>
|
||||
<Dependency>libmodplug-devel</Dependency>
|
||||
<Dependency>pulseaudio-libs-devel</Dependency>
|
||||
<Dependency>openjpeg-devel</Dependency>
|
||||
<!-- <Dependency>openjpeg-devel</Dependency> -->
|
||||
<Dependency>openjpeg2-devel</Dependency>
|
||||
<Dependency>frei0r-plugins-devel</Dependency>
|
||||
<Dependency>rtmpdump-devel</Dependency>
|
||||
<Dependency>schroedinger-devel</Dependency>
|
||||
@@ -57,7 +58,7 @@
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>chromium.patch</Patch>
|
||||
<Patch>fs56089.patch</Patch>
|
||||
<!-- <Patch>fs56089.patch</Patch> -->
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -79,7 +80,7 @@
|
||||
<Dependency>gnutls</Dependency>
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libnut</Dependency>
|
||||
<Dependency>libsdl</Dependency>
|
||||
<Dependency>libsdl2</Dependency>
|
||||
<Dependency>libv4l</Dependency>
|
||||
<Dependency>libvpx</Dependency>
|
||||
<Dependency>libxcb</Dependency>
|
||||
@@ -89,7 +90,7 @@
|
||||
<Dependency>alsa-lib</Dependency>
|
||||
<Dependency>freetype</Dependency>
|
||||
<Dependency>libvdpau</Dependency>
|
||||
<Dependency>openjpeg</Dependency>
|
||||
<Dependency>openjpeg2</Dependency>
|
||||
<Dependency>rtmpdump</Dependency>
|
||||
<Dependency>libbluray</Dependency>
|
||||
<Dependency>libdc1394</Dependency>
|
||||
@@ -122,14 +123,21 @@
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="library">/usr/lib/pkgconfig</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2018-04-17</Date>
|
||||
<Update release="8">
|
||||
<Date>2018-04-26</Date>
|
||||
<Version>4.0</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2018-02-18</Date>
|
||||
<Version>3.4.2</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
@@ -93,6 +93,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>1.2.4</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2018-02-18</Date>
|
||||
<Version>1.2.4</Version>
|
||||
|
||||
@@ -128,9 +128,9 @@
|
||||
</Package>
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2018-03-27</Date>
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>0.27.2</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Comment>Version bump</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
|
||||
@@ -93,6 +93,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="6">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>17.12.31</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="5">
|
||||
<Date>2018-01-13</Date>
|
||||
<Version>17.12.31</Version>
|
||||
|
||||
@@ -12,8 +12,6 @@ from pisi.actionsapi import shelltools
|
||||
def setup():
|
||||
# Make it build with libtool 1.5
|
||||
#shelltools.system("rm -rf m4/lt* m4/libtool.m4")
|
||||
shelltools.system("sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp")
|
||||
shelltools.system("sed -e 's|-Werror-implicit-function-declaration||g' -i configure")
|
||||
shelltools.system("sed -i '/DEPRECATED/s:^://:' modules/text_renderer/freetype/text_layout.c")
|
||||
shelltools.system("export CFLAGS+=-I/usr/include/samba-4.0")
|
||||
shelltools.system("export CPPFLAGS+=-I/usr/include/samba-4.0")
|
||||
|
||||
@@ -13,14 +13,13 @@
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>VLC media player</Summary>
|
||||
<Description>VLC is a famous video player and streamer.</Description>
|
||||
<Archive sha1sum="9eab63eeb525f200220fe7f99ca2a67805058517" type="tarxz">http://mirrors.netix.net/vlc/vlc/3.0.1/vlc-3.0.1.tar.xz</Archive>
|
||||
<Archive sha1sum="9e50c246242cd1dd94a8534b9be11c13104bb76d" type="tarxz">http://mirrors.netix.net/vlc/vlc/3.0.2/vlc-3.0.2.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>qt5-svg-devel</Dependency>
|
||||
<Dependency>wayland-client</Dependency>
|
||||
<Dependency>libcdio-devel</Dependency>
|
||||
<Dependency>eudev-devel</Dependency>
|
||||
<Dependency>lua-devel</Dependency>
|
||||
<!--Dependency>lua51-devel</Dependency-->
|
||||
<Dependency>libgcrypt-devel</Dependency>
|
||||
<Dependency>xcb-proto</Dependency>
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
@@ -309,6 +308,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2018-04-28</Date>
|
||||
<Version>3.0.2</Version>
|
||||
<Comment>Version Bump</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2018-03-03</Date>
|
||||
<Version>3.0.1</Version>
|
||||
|
||||
@@ -54,6 +54,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="8">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>2.5.7</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="7">
|
||||
<Date>2018-02-20</Date>
|
||||
<Version>2.5.7</Version>
|
||||
|
||||
@@ -136,6 +136,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2018-04-26</Date>
|
||||
<Version>1.2.9</Version>
|
||||
<Comment>Rebuild ffmpeg.</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2018-03-24</Date>
|
||||
<Version>1.2.9</Version>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>app:console</IsA>
|
||||
<Summary>A Remote Desktop Implementation</Summary>
|
||||
<Description>FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under Apacle License.</Description>
|
||||
<Archive sha1sum="53cd2a8992a1e2c05978ab2083a12ac573985df2" type="targz">https://github.com/FreeRDP/FreeRDP/archive/6001cb710dc67eb8811362b7bf383754257a902b/FreeRDP-6001cb710dc67eb8811362b7bf383754257a902b.tar.gz</Archive>
|
||||
<Archive sha1sum="2525334cdb298a6e6cea8a4b04666ffdddb3bc74" type="targz">https://github.com/FreeRDP/FreeRDP/archive/782039c6aab533f27f5bbe1fee0b733d98606780/FreeRDP-782039c6aab533f27f5bbe1fee0b733d98606780.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>cups-devel</Dependency>
|
||||
<Dependency>ffmpeg-devel</Dependency>
|
||||
@@ -82,6 +82,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2018-04-26</Date>
|
||||
<Version>2.0_20180426</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2017-03-01</Date>
|
||||
<Version>2.0_20170201</Version>
|
||||
|
||||
@@ -72,6 +72,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="9">
|
||||
<Date>2018-04-27</Date>
|
||||
<Version>0.3.9</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="8">
|
||||
<Date>2018-01-31</Date>
|
||||
<Version>0.3.9</Version>
|
||||
|
||||
+153843
-153722
File diff suppressed because it is too large
Load Diff
@@ -1 +1 @@
|
||||
37145e3a0b9752d78e787a0613bb664ab29079b0
|
||||
0ef9c0819af64a3a2e3f57439ed2b305d7e05bfb
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
be8ee7bd2fb6c670f06fead801398ed9fb8296ae
|
||||
3d5c7f28872a14e26e24238bd9ed3b4b1cfba377
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
<PISI>
|
||||
<Name>x11.wm</Name>
|
||||
</PISI>
|
||||
@@ -0,0 +1,42 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/copyleft/gpl.txt.
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
|
||||
def setup():
|
||||
shelltools.export("AUTOPOINT", "true")
|
||||
autotools.autoreconf("-fiv")
|
||||
autotools.configure("--disable-static \
|
||||
--prefix=/usr \
|
||||
--with-x \
|
||||
--enable-nls \
|
||||
--sysconfdir=/etc \
|
||||
--libexecdir=/usr/libexec/openbox \
|
||||
--enable-startup-notification \
|
||||
--docdir=/%s/%s" % (get.docDIR(), get.srcNAME()))
|
||||
|
||||
pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""')
|
||||
pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE")
|
||||
pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
# GNOME Panel is no longer available in the official repositories
|
||||
pisitools.remove("/usr/bin/gdm-control")
|
||||
pisitools.remove("/usr/bin/gnome-panel-control")
|
||||
pisitools.remove("/usr/bin/openbox-gnome-session")
|
||||
pisitools.remove("/usr/share/man/man1/openbox-gnome-session.1")
|
||||
pisitools.remove("/usr/share/xsessions/openbox-gnome.desktop")
|
||||
pisitools.removeDir("/usr/share/gnome-session")
|
||||
|
||||
pisitools.dodoc("AUTHORS", "CHANGELOG", "COPYING", "README")
|
||||
@@ -0,0 +1,23 @@
|
||||
by Nico Golde <nion@debian.org>
|
||||
the freedesktop standard requires some additional attributes in the desktop files
|
||||
which are added here to fix #533126, #531580
|
||||
Index: openbox-3.4.11.1/data/gnome-wm-properties/openbox.desktop
|
||||
===================================================================
|
||||
--- openbox-3.4.11.1.orig/data/gnome-wm-properties/openbox.desktop 2010-04-23 16:47:53.000000000 +0200
|
||||
+++ openbox-3.4.11.1/data/gnome-wm-properties/openbox.desktop 2010-04-23 16:48:08.000000000 +0200
|
||||
@@ -2,10 +2,15 @@
|
||||
Type=Application
|
||||
Name=Openbox
|
||||
Exec=openbox
|
||||
+Type=Application
|
||||
+Categories=System;
|
||||
|
||||
# name we put on the WM spec check window
|
||||
X-GNOME-WMName=Openbox
|
||||
|
||||
+X-GNOME-Provides=windowmanager
|
||||
+NoDisplay=true
|
||||
+
|
||||
# our config tool
|
||||
ConfigExec=obconf
|
||||
|
||||
Executable
+25
@@ -0,0 +1,25 @@
|
||||
#
|
||||
# These things are run when an Openbox X Session is started.
|
||||
# You may place a similar script in $HOME/.config/openbox/autostart
|
||||
# to run user-specific things.
|
||||
#
|
||||
|
||||
# If you want to use GNOME config tools...
|
||||
#
|
||||
#if test -x /usr/libexec/gnome-settings-daemon >/dev/null; then
|
||||
# /usr/libexec/gnome-settings-daemon &
|
||||
#elif which gnome-settings-daemon >/dev/null; then
|
||||
# gnome-settings-daemon &
|
||||
#fi
|
||||
|
||||
# If you want to use XFCE config tools...
|
||||
#
|
||||
#xfce-mcs-manager &
|
||||
|
||||
Esetroot -center /usr/share/openbox/RepublicDayofTurkey.png
|
||||
/usr/libexec/polkit-gnome-authentication-agent-1 &
|
||||
(sleep 3 && /usr/bin/nm-applet --sm-disable) &
|
||||
tint2 &
|
||||
conky &
|
||||
pulseaudio &
|
||||
(sleep 3 && /usr/bin/volumeicon) &
|
||||
Executable
BIN
Binary file not shown.
|
After Width: | Height: | Size: 580 KiB |
Executable
+347
@@ -0,0 +1,347 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<openbox_menu xmlns="http://openbox.org/3.4/menu">
|
||||
|
||||
<menu id="apps-editors-menu" label="Editors">
|
||||
<item label="Leafpad">
|
||||
<action name="Execute">
|
||||
<command>leafpad</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Kate">
|
||||
<action name="Execute">
|
||||
<command>kate</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Kwrite">
|
||||
<action name="Execute">
|
||||
<command>kwrite</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu id="apps-term-menu" label="Terminal">
|
||||
<item label="Lxde Terminal">
|
||||
<action name="Execute">
|
||||
<command>lxterminal</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Konsole">
|
||||
<action name="Execute">
|
||||
<command>konsole</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu id="apps-net-menu" label="İnternet">
|
||||
<item label="Firefox">
|
||||
<action name="Execute">
|
||||
<command>firefox</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
<wmclass>Firefox</wmclass>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Chromium Browser">
|
||||
<action name="Execute">
|
||||
<command>chromium-browser</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
<wmclass>Firefox</wmclass>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Konqueror">
|
||||
<action name="Execute">
|
||||
<command>konqueror</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Opera">
|
||||
<action name="Execute">
|
||||
<command>opera</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
<wmclass>Opera</wmclass>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Kopete">
|
||||
<action name="Execute">
|
||||
<command>kopete</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Pidgin Instant Messenger">
|
||||
<action name="Execute">
|
||||
<command>pidgin</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Skype">
|
||||
<action name="Execute">
|
||||
<command>skype</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Konversation">
|
||||
<action name="Execute">
|
||||
<command>konversation</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="XChat">
|
||||
<action name="Execute">
|
||||
<command>xchat</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu id="apps-office-menu" label="Office">
|
||||
<item label="LibreOffice Base">
|
||||
<action name="Execute">
|
||||
<command>libreoffice --base</command>
|
||||
</action>
|
||||
</item>
|
||||
<item label="LibreOffice Calc">
|
||||
<action name="Execute">
|
||||
<command>libreoffice --calc</command>
|
||||
</action>
|
||||
</item>
|
||||
<item label="LibreOffice Impress">
|
||||
<action name="Execute">
|
||||
<command>libreoffice --impress</command>
|
||||
</action>
|
||||
</item>
|
||||
<item label="LibreOffice writer">
|
||||
<action name="Execute">
|
||||
<command>libreoffice --writer</command>
|
||||
</action>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu id="apps-multimedia-menu" label="Multimedia">
|
||||
<item label="Clementine">
|
||||
<action name="Execute">
|
||||
<command>clementine</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="K3b">
|
||||
<action name="Execute">
|
||||
<command>k3b</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Vlc Player">
|
||||
<action name="Execute">
|
||||
<command>vlc</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Gnome MPlayer">
|
||||
<action name="Execute">
|
||||
<command>gnome-mplayer</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
<wmclass>MPlayer</wmclass>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="SMPlayer">
|
||||
<action name="Execute">
|
||||
<command>smplayer</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
<wmclass>MPlayer</wmclass>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Record My Desktop">
|
||||
<action name="Execute">
|
||||
<command>qt-recordMyDesktop</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
<wmclass>MPlayer</wmclass>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Kamerka">
|
||||
<action name="Execute">
|
||||
<command>kamerka</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
<wmclass>MPlayer</wmclass>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu id="apps-fileman-menu" label="File Managers">
|
||||
<item label="KDE File Manager">
|
||||
<action name="Execute">
|
||||
<command>kfmclient openURL ~</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="PCManFM File Manager">
|
||||
<action name="Execute">
|
||||
<command>pcmanfm</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Thunar">
|
||||
<action name="Execute">
|
||||
<command>Thunar</command>
|
||||
<startupnotify>
|
||||
<enabled>yes</enabled>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu id="apps-graphics-menu" label="Graphics">
|
||||
<item label="Gimp">
|
||||
<action name="Execute">
|
||||
<command>gimp</command>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Gwenview">
|
||||
<action name="Execute">
|
||||
<command>gwenview</command>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Inkscape">
|
||||
<action name="Execute">
|
||||
<command>inkscape</command>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Ksnapshot">
|
||||
<action name="Execute">
|
||||
<command>ksnapshot -caption "%c"</command>
|
||||
</action>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu id="system-menu" label="System">
|
||||
<item label="Package Manager">
|
||||
<action name="Execute">
|
||||
<command>package-manager</command>
|
||||
<startupnotify><enabled>yes</enabled></startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Screen Resolution">
|
||||
<action name="Execute">
|
||||
<command>lxrandr</command>
|
||||
<startupnotify><enabled>yes</enabled></startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Desktop Wallpaper">
|
||||
<action name="Execute">
|
||||
<command>gsetroot</command>
|
||||
<startupnotify><enabled>yes</enabled></startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Openbox Configuration Manager">
|
||||
<action name="Execute">
|
||||
<command>obconf</command>
|
||||
<startupnotify><enabled>yes</enabled></startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="KDE Control Center">
|
||||
<action name="Execute">
|
||||
<command>systemsettings</command>
|
||||
<startupnotify><enabled>yes</enabled></startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Sound Volume Manager">
|
||||
<action name="Execute">
|
||||
<command>pavucontrol</command>
|
||||
<startupnotify><enabled>yes</enabled></startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<item label="Manage Cups Printers">
|
||||
<action name="Execute">
|
||||
<command>xdg-open http://localhost:631/</command>
|
||||
<startupnotify>
|
||||
<enabled>no</enabled>
|
||||
<icon>cups</icon>
|
||||
</startupnotify>
|
||||
</action>
|
||||
</item>
|
||||
<separator />
|
||||
<item label="Reconfigure Openbox">
|
||||
<action name="Reconfigure" />
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
<menu id="root-menu" label="Openbox 3">
|
||||
<separator label="Shortcuts" />
|
||||
<item label="Firefox">
|
||||
<action name="Execute"><command>firefox</command></action>
|
||||
</item>
|
||||
<item label="File Manager">
|
||||
<action name="Execute"><command>pcmanfm</command></action>
|
||||
</item>
|
||||
<item label="LX-Panel">
|
||||
<action name="Execute"><command>lxpanel</command></action>
|
||||
</item>
|
||||
<separator label="Applications" />
|
||||
<menu id="apps-accessories-menu"/>
|
||||
<menu id="apps-editors-menu"/>
|
||||
<menu id="apps-graphics-menu"/>
|
||||
<menu id="apps-net-menu"/>
|
||||
<menu id="apps-office-menu"/>
|
||||
<menu id="apps-multimedia-menu"/>
|
||||
<menu id="apps-term-menu"/>
|
||||
<menu id="apps-fileman-menu"/>
|
||||
<separator label="System" />
|
||||
<menu id="system-menu"/>
|
||||
<separator />
|
||||
<item label="Log Out">
|
||||
<action name="Exit">
|
||||
<prompt>yes</prompt>
|
||||
</action>
|
||||
</item>
|
||||
</menu>
|
||||
|
||||
</openbox_menu>
|
||||
Executable
+6
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openbox_menu xmlns="http://openbox.org/"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://openbox.org/">
|
||||
<menu id="root-menu" label="obmenu-generator" execute="/usr/bin/obmenu-generator"/>
|
||||
</openbox_menu>
|
||||
Executable
+540
@@ -0,0 +1,540 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
# Copyright (C) 2011-2014 Daniel "Trizen" Șuteu <echo dHJpemVueEBnbWFpbC5jb20K | base64 -d>.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Openbox Menu Generator
|
||||
# A fast pipe/static menu generator for the Openbox Window Manager.
|
||||
|
||||
# Program: obmenu-generator
|
||||
# License: GPLv3
|
||||
# Created on: 25 March 2011
|
||||
# Latest edit on: 26 March 2014
|
||||
|
||||
# Websites: http://trizen.googlecode.com
|
||||
# http://trizenx.blogspot.com
|
||||
|
||||
#use 5.014;
|
||||
#use strict;
|
||||
#use warnings;
|
||||
|
||||
require Linux::DesktopFiles;
|
||||
|
||||
$Linux::DesktopFiles::VERSION >= 0.08
|
||||
|| die "Update Linux::DesktopFiles to a newer version! (requires >=0.08)\n";
|
||||
|
||||
my $pkgname = 'obmenu-generator';
|
||||
my $version = 0.59;
|
||||
|
||||
our ($CONFIG, $SCHEMA);
|
||||
my $output_h = *STDOUT;
|
||||
|
||||
my ($pipe, $static, $icons, $reconfigure, $stdout_config, $update_config);
|
||||
|
||||
my $home_dir =
|
||||
$ENV{HOME}
|
||||
|| $ENV{LOGDIR}
|
||||
|| (getpwuid($<))[7]
|
||||
|| `echo -n ~`;
|
||||
|
||||
my $xdg_config_home = "$home_dir/.config";
|
||||
|
||||
my $menu_id = "root-menu";
|
||||
my $config_dir = "$xdg_config_home/$pkgname";
|
||||
my $schema_file = "$config_dir/schema.pl";
|
||||
my $config_file = "$config_dir/config.pl";
|
||||
my $openbox_conf = "$xdg_config_home/openbox";
|
||||
my $menufile = "$openbox_conf/menu.xml";
|
||||
my $icons_db = "$config_dir/icons.db";
|
||||
|
||||
sub usage {
|
||||
print <<"HELP";
|
||||
usage: $0 [options]
|
||||
|
||||
Options:
|
||||
-p : (re)generate a pipe menu
|
||||
-s : (re)generate a static menu
|
||||
-o : static menu file (default: ~/.config/openbox/menu.xml)
|
||||
-m : menu id (default: 'root-menu')
|
||||
-r : regenerate the config files
|
||||
-i : use icons in menus
|
||||
-d : regenerate icons.db (with -i)
|
||||
-u : update the config file
|
||||
-R : reconfigure openbox
|
||||
|
||||
Help:
|
||||
-h : print this message
|
||||
-v : print the version number
|
||||
|
||||
Examples:
|
||||
** Static menu without icons:
|
||||
$0 -s
|
||||
|
||||
** Pipe menu with icons:
|
||||
$0 -p -i
|
||||
|
||||
** Reconfigure openbox:
|
||||
$0 -R
|
||||
|
||||
** Config file: $config_file
|
||||
** Schema file: $schema_file
|
||||
HELP
|
||||
exit 0;
|
||||
}
|
||||
|
||||
my $config_help = <<"HELP";
|
||||
|
||||
|| FILTERING
|
||||
| skip_filename_re : Skip a .desktop file if its name matches the regex.
|
||||
Name is from the last slash to the end. (filename.desktop)
|
||||
Example: qr/^(?:gimp|xterm)\\b/, # skips 'gimp' and 'xterm'
|
||||
|
||||
| skip_entry : Skip a destkop file if the value from a given key matches the regex.
|
||||
Example: [
|
||||
{key => 'Name', re => qr/(?:about|terminal)/i},
|
||||
{key => 'Exec', re => qr/^xterm/},
|
||||
],
|
||||
|
||||
| substitutions : Substitute, by using a regex, in the values of the desktop files.
|
||||
Example: [
|
||||
{key => 'Exec', re => qr/xterm/, value => 'sakura'},
|
||||
{key => 'Exec', re => qr/\\\\\\\\/, value => '\\\\', global => 1}, # for wine apps
|
||||
],
|
||||
|
||||
|
||||
|| ICON SETTINGS
|
||||
| icon_dirs_first : When looking for icons, look in this directories first,
|
||||
before looking in the directories of the current icon theme.
|
||||
Example: [
|
||||
"\$ENV{HOME}/My icons",
|
||||
],
|
||||
|
||||
| icon_dirs_second : Look in this directories after looked in the directories of the
|
||||
current icon theme. (Before /usr/share/pixmaps)
|
||||
Example: [
|
||||
"/usr/share/icons/gnome",
|
||||
],
|
||||
|
||||
| icon_dirs_last : Look in this directories at the very last, after looked in
|
||||
/usr/share/pixmaps, /usr/share/icons/hicolor and some other
|
||||
directories.
|
||||
Example: [
|
||||
"/usr/share/icons/Tango",
|
||||
],
|
||||
|
||||
| strict_icon_dirs : A true value will make the module to look only inside the directories
|
||||
specified by you in either one of the above three options.
|
||||
|
||||
| gtk_rc_filename : Absolute path to the GTK configuration file.
|
||||
| missing_image : Use this icon for missing icons (default: gtk-missing-image)
|
||||
|
||||
|
||||
|| KEYS
|
||||
| name_keys : Valid keys for the item names.
|
||||
Example: ['Name[fr]', 'GenericName[fr]', 'Name'], # french menu
|
||||
|
||||
|
||||
|| PATHS
|
||||
| desktop_files_paths : Absolute paths which contains .desktop files.
|
||||
Example: [
|
||||
'/usr/share/applications',
|
||||
"\$ENV{HOME}/.local/share/applications",
|
||||
glob("\$ENV{HOME}/.local/share/applications/wine/Programs/*"),
|
||||
],
|
||||
|
||||
|
||||
|| NOTES
|
||||
| Regular expressions:
|
||||
* use qr/RE/ instead of 'RE'
|
||||
* use qr/RE/i for case insenstive mode
|
||||
HELP
|
||||
|
||||
if (@ARGV) {
|
||||
while (defined(my $arg = shift @ARGV)) {
|
||||
if ($arg eq '-i') {
|
||||
$icons = 1;
|
||||
}
|
||||
elsif ($arg eq '-S') {
|
||||
$stdout_config = 1;
|
||||
}
|
||||
elsif ($arg eq '-p') {
|
||||
$pipe = 1;
|
||||
}
|
||||
elsif ($arg eq '-r') {
|
||||
$reconfigure = 1;
|
||||
}
|
||||
elsif ($arg eq '-s') {
|
||||
$static = 1;
|
||||
}
|
||||
elsif ($arg eq '-d') {
|
||||
unlink $icons_db;
|
||||
}
|
||||
elsif ($arg eq '-u') {
|
||||
$update_config = 1;
|
||||
}
|
||||
elsif ($arg eq '-v') {
|
||||
print "$pkgname $version\n";
|
||||
exit 0;
|
||||
}
|
||||
elsif ($arg eq '-R') {
|
||||
exec 'openbox', '--reconfigure';
|
||||
}
|
||||
elsif ($arg eq '-o') {
|
||||
$menufile = shift(@ARGV) // die "$0: option '-o' requires an argument!\n";
|
||||
}
|
||||
elsif ($arg eq '-m') {
|
||||
$menu_id = shift(@ARGV) // die "$0: option '-m' requires an argument!\n";
|
||||
}
|
||||
elsif ($arg eq '-h') {
|
||||
usage();
|
||||
}
|
||||
else {
|
||||
die "$0: option `$arg' is invalid!\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (not -d $config_dir) {
|
||||
require File::Path;
|
||||
File::Path::make_path($config_dir)
|
||||
or die "Can't create directory '${config_dir}': $!";
|
||||
}
|
||||
|
||||
my $config_documentation = <<"EOD";
|
||||
#!/usr/bin/perl
|
||||
|
||||
# $pkgname - configuration file
|
||||
# This file will be updated automatically every time when is needed.
|
||||
# Any additional comment and/or indentation will be lost.
|
||||
|
||||
=for comment
|
||||
$config_help
|
||||
=cut
|
||||
|
||||
EOD
|
||||
|
||||
my %CONFIG = (
|
||||
'Linux::DesktopFiles' => {
|
||||
|
||||
keep_unknown_categories => 1,
|
||||
unknown_category_key => 'other',
|
||||
gtk_rc_filename => "$home_dir/.gtkrc-2.0",
|
||||
|
||||
skip_entry => undef,
|
||||
substitutions => undef,
|
||||
skip_filename_re => undef,
|
||||
|
||||
terminalize => 1,
|
||||
terminalization_format => q{%s -e '%s'},
|
||||
|
||||
desktop_files_paths => ['/usr/share/applications'],
|
||||
|
||||
icon_dirs_first => undef,
|
||||
icon_dirs_second => undef,
|
||||
icon_dirs_last => undef,
|
||||
strict_icon_dirs => undef,
|
||||
|
||||
skip_svg_icons => 1,
|
||||
},
|
||||
|
||||
name_keys => ['Name'],
|
||||
terminal => 'xterm',
|
||||
editor => 'geany',
|
||||
missing_icon => 'gtk-missing-image',
|
||||
VERSION => $version,
|
||||
);
|
||||
|
||||
sub dump_configuration {
|
||||
require Data::Dump;
|
||||
open my $config_fh, '>', $config_file
|
||||
or die "Can't open file '${config_file}' for write: $!";
|
||||
my $dumped_config = q{our $CONFIG = } . Data::Dump::dump(\%CONFIG);
|
||||
print $config_fh $config_documentation, $dumped_config;
|
||||
close $config_fh;
|
||||
}
|
||||
|
||||
if (not -e $config_file or $reconfigure) {
|
||||
dump_configuration();
|
||||
}
|
||||
|
||||
if (not -e $schema_file) {
|
||||
if (-e (my $etc_schema_file = "/etc/xdg/$pkgname/schema.pl")) {
|
||||
require File::Copy;
|
||||
File::Copy::copy($etc_schema_file, $schema_file)
|
||||
or die "$0: can't copy file `$etc_schema_file' to `$schema_file': $!\n";
|
||||
}
|
||||
else {
|
||||
die "$0: schema file `$schema_file' does not exists!\n";
|
||||
}
|
||||
}
|
||||
|
||||
require $schema_file; # Load the configuration files
|
||||
|
||||
# Remove user's defined values
|
||||
my @valid_keys = grep exists $CONFIG{$_}, keys $CONFIG;
|
||||
@CONFIG{@valid_keys} = @{$CONFIG}{@valid_keys};
|
||||
|
||||
# Keep user's defined values
|
||||
#@CONFIG{keys %{$CONFIG}} = values %{$CONFIG};
|
||||
|
||||
if ($CONFIG{VERSION} != $version) {
|
||||
$update_config = 1;
|
||||
$CONFIG{VERSION} = $version;
|
||||
}
|
||||
|
||||
if ($icons && !$pipe) {
|
||||
|
||||
# Performance improvement
|
||||
# XXX: don't do this in production code!
|
||||
@INC{
|
||||
qw(
|
||||
strict.pm
|
||||
warnings.pm
|
||||
Tie/Hash.pm
|
||||
Carp.pm
|
||||
Exporter.pm
|
||||
warnings/register.pm
|
||||
)
|
||||
} = ();
|
||||
|
||||
*{'warnings::warnif'} = sub { };
|
||||
}
|
||||
|
||||
my $desk_obj = Linux::DesktopFiles->new(
|
||||
%{$CONFIG{'Linux::DesktopFiles'}},
|
||||
|
||||
home_dir => $home_dir,
|
||||
|
||||
categories => [map $_->{cat}[0], grep exists $_->{cat}, @$SCHEMA],
|
||||
keys_to_keep => [@{$CONFIG{name_keys}}, 'Exec', $icons ? 'Icon' : ()],
|
||||
|
||||
$icons
|
||||
? (
|
||||
abs_icon_paths => 1,
|
||||
icon_db_filename => $icons_db,
|
||||
)
|
||||
: (),
|
||||
|
||||
terminal => $CONFIG{terminal},
|
||||
keep_empty_categories => 0,
|
||||
case_insensitive_cats => 1,
|
||||
);
|
||||
|
||||
if ($pipe or $static) {
|
||||
my $menu_backup = $menufile . '.bak';
|
||||
if (not -e $menu_backup and -e $menufile) {
|
||||
require File::Copy;
|
||||
File::Copy::copy($menufile, $menu_backup);
|
||||
}
|
||||
|
||||
if ($static) {
|
||||
open $output_h, '>', $menufile
|
||||
or die "Can't open file '${menufile}' for write: $!";
|
||||
}
|
||||
elsif ($pipe) {
|
||||
if (not -d $openbox_conf) {
|
||||
require File::Path;
|
||||
File::Path::make_path($openbox_conf)
|
||||
or die "Can't create directory '${openbox_conf}': $!";
|
||||
}
|
||||
|
||||
require Cwd;
|
||||
my $exec_name = Cwd::abs_path($0) . ($icons ? q{ -i} : q{});
|
||||
|
||||
if (not -x $exec_name) {
|
||||
$exec_name = "$^X $exec_name";
|
||||
}
|
||||
|
||||
open my $fh, '>', $menufile
|
||||
or die "Can't open file '${menufile}' for write: $!";
|
||||
print $fh <<"PIPE_MENU_HEADER";
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openbox_menu xmlns="http://openbox.org/"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://openbox.org/">
|
||||
<menu id="$menu_id" label="$pkgname" execute="$exec_name" />
|
||||
</openbox_menu>
|
||||
PIPE_MENU_HEADER
|
||||
close $fh;
|
||||
|
||||
print <<'EOT';
|
||||
** The pipe menu has been successfully generated!
|
||||
EOT
|
||||
|
||||
exec 'openbox', '--reconfigure';
|
||||
}
|
||||
}
|
||||
|
||||
my $generated_menu = $static
|
||||
? <<"STATIC_MENU_HEADER"
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openbox_menu xmlns="http://openbox.org/"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://openbox.org/">
|
||||
<menu id="$menu_id" label="Applications">
|
||||
STATIC_MENU_HEADER
|
||||
: "<openbox_pipe_menu>\n";
|
||||
|
||||
{
|
||||
my %cache;
|
||||
|
||||
sub check_icon {
|
||||
$_[0] // return '';
|
||||
$cache{$_[0]} //= ((chr ord($_[0]) eq '/') ? $_[0] : $desk_obj->get_icon_path($_[0])
|
||||
|| $desk_obj->get_icon_path($CONFIG{missing_icon}));
|
||||
}
|
||||
}
|
||||
|
||||
sub prepare_item {
|
||||
$icons
|
||||
? <<"ITEM_WITH_ICON"
|
||||
<item label="$_[1]" icon="${\check_icon($_[2])}"><action name="Execute"><execute>$_[0]</execute></action></item>
|
||||
ITEM_WITH_ICON
|
||||
: <<"ITEM";
|
||||
<item label="$_[1]"><action name="Execute"><execute>$_[0]</execute></action></item>
|
||||
ITEM
|
||||
}
|
||||
|
||||
sub begin_category {
|
||||
$icons
|
||||
? <<"MENU_WITH_ICON"
|
||||
<menu id="$_[0]" icon="${\check_icon($_[1])}" label="$_[0]">
|
||||
MENU_WITH_ICON
|
||||
: <<"MENU"
|
||||
<menu id="$_[0]" label="$_[0]">
|
||||
MENU
|
||||
}
|
||||
|
||||
my $categories = $desk_obj->parse_desktop_files();
|
||||
|
||||
foreach my $schema (@$SCHEMA) {
|
||||
if (exists $schema->{cat}) {
|
||||
exists($categories->{my $category = lc($schema->{cat}[0]) =~ tr/_a-z0-9/_/cr}) || next;
|
||||
$generated_menu .= begin_category($schema->{cat}[1], ($icons ? $schema->{cat}[2] : ())) . join(
|
||||
q{},
|
||||
(
|
||||
map $_->[1],
|
||||
sort { $a->[0] cmp $b->[0] }
|
||||
map [lc($_) => $_],
|
||||
map {
|
||||
|
||||
my $name;
|
||||
my $exec = $_->{Exec};
|
||||
|
||||
foreach my $key (@{$CONFIG{name_keys}}) {
|
||||
if (defined $_->{$key}) {
|
||||
$name = $_->{$key};
|
||||
last;
|
||||
}
|
||||
}
|
||||
|
||||
foreach my $item ($name, $exec) {
|
||||
if ($item =~ tr/"&//) {
|
||||
$item =~ s/&/&/g;
|
||||
$item =~ s/"/"/g;
|
||||
}
|
||||
}
|
||||
|
||||
$icons
|
||||
? <<"ITEM_WITH_ICON"
|
||||
<item label="$name" icon="${\check_icon($_->{Icon})}"><action name="Execute"><execute>$exec</execute></action></item>
|
||||
ITEM_WITH_ICON
|
||||
: <<"ITEM";
|
||||
<item label="$name"><action name="Execute"><execute>$exec</execute></action></item>
|
||||
ITEM
|
||||
} @{$categories->{$category}}
|
||||
)
|
||||
)
|
||||
. qq[ </menu>\n];
|
||||
}
|
||||
elsif (exists $schema->{item}) {
|
||||
$generated_menu .= prepare_item(@{$schema->{item}});
|
||||
}
|
||||
elsif (exists $schema->{sep}) {
|
||||
$generated_menu .=
|
||||
defined $schema->{sep}
|
||||
? qq[ <separator label="$schema->{sep}"/>\n]
|
||||
: qq[ <separator/>\n];
|
||||
}
|
||||
elsif (exists $schema->{begin_cat}) {
|
||||
$generated_menu .= begin_category(@{$schema->{begin_cat}});
|
||||
}
|
||||
elsif (exists $schema->{end_cat}) {
|
||||
$generated_menu .= qq[ </menu>\n];
|
||||
}
|
||||
elsif (exists $schema->{exit}) {
|
||||
my ($label, $icon) = @{$schema->{exit}};
|
||||
$generated_menu .= $icons
|
||||
? <<"EXIT_WITH_ICON"
|
||||
<item label="$label" icon="${\check_icon($icon)}"><action name="Exit"/></item>
|
||||
EXIT_WITH_ICON
|
||||
: <<"EXIT";
|
||||
<item label="$label"><action name="Exit"/></item>
|
||||
EXIT
|
||||
}
|
||||
elsif (exists $schema->{raw}) {
|
||||
$generated_menu .= qq[ $schema->{raw}\n];
|
||||
}
|
||||
elsif (exists $schema->{pipe}) {
|
||||
my ($command, $label, $icon) = @{$schema->{pipe}};
|
||||
$generated_menu .= $icons
|
||||
? <<"PIPE_WITH_ICON"
|
||||
<menu id="$label" label="$label" execute="$command" icon="${\check_icon($icon)}"/>
|
||||
PIPE_WITH_ICON
|
||||
: <<"PIPE";
|
||||
<menu id="$label" label="$label" execute="$command"/>
|
||||
PIPE
|
||||
}
|
||||
elsif (exists $schema->{obgenmenu}) {
|
||||
my ($name, $icon) = ref($schema->{obgenmenu}) eq 'ARRAY' ? @{$schema->{obgenmenu}} : $schema->{obgenmenu};
|
||||
$generated_menu .= ($icons ? <<"CONFIG_MENU_WITH_ICON" : <<"CONFIG_MENU") . <<'RECONFIGURE';
|
||||
<menu id="$name" label="$name" icon="${\check_icon($icon)}">
|
||||
CONFIG_MENU_WITH_ICON
|
||||
<menu id="$name" label="$name">
|
||||
CONFIG_MENU
|
||||
<item label="Reconfigure Openbox"><action name="Reconfigure" /></item>
|
||||
RECONFIGURE
|
||||
|
||||
-e '/usr/bin/obconf' && ($generated_menu .= <<'EOL');
|
||||
<item label="Openbox Configuration Manager"><action name="Execute"><execute>obconf</execute></action></item>
|
||||
EOL
|
||||
|
||||
$generated_menu .= <<"CONFIG_MENU";
|
||||
<item label="Configure autostarted apps"><action name="Execute"><execute>$CONFIG{editor} $openbox_conf/autostart</execute></action></item>
|
||||
<item label="Edit rc.xml"><action name="Execute"><execute>$CONFIG{editor} $openbox_conf/rc.xml</execute></action></item>
|
||||
<separator />
|
||||
<item label="Generate a pipe menu"><action name="Execute"><execute>$0 -p</execute></action></item>
|
||||
<item label="Generate a static menu"><action name="Execute"><execute>$0 -s</execute></action></item>
|
||||
<item label="Generate a pipe menu with icons"><action name="Execute"><execute>$0 -p -i</execute></action></item>
|
||||
<item label="Generate a static menu with icons"><action name="Execute"><execute>$0 -s -i</execute></action></item>
|
||||
<separator />
|
||||
<item label="Edit menu.xml"><action name="Execute"><execute>$CONFIG{editor} $menufile</execute></action></item>
|
||||
<item label="Edit the schema file"><action name="Execute"><execute>$CONFIG{editor} $schema_file</execute></action></item>
|
||||
<item label="Edit the configuration file"><action name="Execute"><execute>$CONFIG{editor} $config_file</execute></action></item>
|
||||
<separator />
|
||||
<item label="Regenerate configuration file"><action name="Execute"><execute>$0 -r</execute></action></item>
|
||||
</menu>
|
||||
CONFIG_MENU
|
||||
}
|
||||
else {
|
||||
warn "$0: Invalid key '", (keys %{$schema})[0], "' in schema file!\n";
|
||||
}
|
||||
}
|
||||
|
||||
print $output_h $generated_menu, $static
|
||||
? qq[ </menu>\n</openbox_menu>\n]
|
||||
: qq[</openbox_pipe_menu>\n];
|
||||
|
||||
dump_configuration() if $update_config;
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
--- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
|
||||
+++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
|
||||
@@ -883,7 +883,7 @@
|
||||
!g_pattern_match(app->role,
|
||||
strlen(self->role), self->role, NULL))
|
||||
match = FALSE;
|
||||
- else if (app->title &&
|
||||
+ else if (app->title && self->title &&
|
||||
!g_pattern_match(app->title,
|
||||
strlen(self->title), self->title, NULL))
|
||||
match = FALSE;
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
--- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
|
||||
+++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
#
|
||||
#if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
|
||||
# @libexecdir@/gnome-settings-daemon &
|
||||
-#elif which gnome-settings-daemon >/dev/null; then
|
||||
+#elif which gnome-settings-daemon >/dev/null 2>&1; then
|
||||
# gnome-settings-daemon &
|
||||
#fi
|
||||
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
--- data/rc.xml.theme 2011-08-01 17:03:47.000000000 +0200
|
||||
+++ data/rc.xml 2011-08-01 17:05:09.000000000 +0200
|
||||
@@ -48,7 +48,7 @@
|
||||
</placement>
|
||||
|
||||
<theme>
|
||||
- <name>Clearlooks</name>
|
||||
+ <name>Onyx</name>
|
||||
<titleLayout>NLIMC</titleLayout>
|
||||
<!--
|
||||
available characters are NDSLIMC, each can occur at most once.
|
||||
Executable
+103
@@ -0,0 +1,103 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
# obmenu-generator - schema file
|
||||
|
||||
=for comment
|
||||
|
||||
item: add an item inside the menu {item => ["command", "label", "icon"]},
|
||||
cat: add a category inside the menu {cat => ["name", "label", "icon"]},
|
||||
sep: horizontal line separator {sep => undef}, {sep => "label"},
|
||||
pipe: a pipe menu entry {pipe => ["command", "label", "icon"]},
|
||||
raw: any valid Openbox XML string {raw => q(xml string)},
|
||||
begin_cat: begin of a category {begin_cat => ["name", "icon"]},
|
||||
end_cat: end of a category {end_cat => undef},
|
||||
obgenmenu: generic menu settings {obgenmenu => ["label", "icon"]},
|
||||
exit: default "Exit" action {exit => ["label", "icon"]},
|
||||
|
||||
=cut
|
||||
|
||||
# NOTE:
|
||||
# * Keys and values are case sensitive. Keep all keys lowercase.
|
||||
# * ICON can be a either a direct path to an icon or a valid icon name
|
||||
# * Category names are case insensitive. (X-XFCE and x_xfce are equivalent)
|
||||
|
||||
require "$ENV{HOME}/.config/obmenu-generator/config.pl";
|
||||
|
||||
## Text editor
|
||||
my $editor = $CONFIG->{editor};
|
||||
|
||||
our $SCHEMA = [
|
||||
# COMMAND LABEL ICON
|
||||
{item => ['lxterminal', 'Terminal', 'lxterminal']},
|
||||
{item => ['firefox', 'Web Browser', 'firefox']},
|
||||
|
||||
{sep => 'Applications'},
|
||||
|
||||
# NAME LABEL ICON
|
||||
{cat => ['utility', 'Accessories', 'applications-utilities']},
|
||||
{cat => ['development', 'Development', 'applications-development']},
|
||||
{cat => ['education', 'Education', 'applications-science']},
|
||||
{cat => ['game', 'Games', 'applications-games']},
|
||||
{cat => ['graphics', 'Graphics', 'applications-graphics']},
|
||||
{cat => ['audiovideo', 'Multimedia', 'applications-multimedia']},
|
||||
{cat => ['network', 'Network', 'applications-internet']},
|
||||
{cat => ['office', 'Office', 'applications-office']},
|
||||
{cat => ['other', 'Other', 'applications-other']},
|
||||
{cat => ['settings', 'Settings', 'applications-accessories']},
|
||||
{cat => ['system', 'System', 'applications-system']},
|
||||
|
||||
#{cat => ['qt', 'QT Applications', 'qtlogo']},
|
||||
#{cat => ['gtk', 'GTK Applications', 'gnome-applications']},
|
||||
#{cat => ['x_xfce', 'XFCE Applications', 'applications-other']},
|
||||
#{cat => ['gnome', 'GNOME Applications', 'gnome-applications']},
|
||||
#{cat => ['consoleonly', 'CLI Applications', 'applications-utilities']},
|
||||
|
||||
# LABEL ICON
|
||||
#{begin_cat => ['My category', 'cat-icon']},
|
||||
# ... some items ...
|
||||
#{end_cat => undef},
|
||||
|
||||
# COMMAND LABEL ICON
|
||||
#{pipe => ['obbrowser', 'Disk', 'drive-harddisk']},
|
||||
|
||||
## Generic advanced settings
|
||||
#{sep => undef},
|
||||
#{obgenmenu => ['Openbox Settings', 'applications-engineering']},
|
||||
#{sep => undef},
|
||||
|
||||
## Custom advanced settings
|
||||
{sep => undef},
|
||||
{begin_cat => ['Advanced Settings', 'gnome-settings']},
|
||||
|
||||
# Configuration files
|
||||
{item => ["$editor ~/.conkyrc", 'Conky RC', $editor]},
|
||||
{item => ["$editor ~/.config/tint2/tint2rc", 'Tint2 Panel', $editor]},
|
||||
|
||||
# obmenu-generator category
|
||||
{begin_cat => ['Obmenu-Generator', 'menu-editor']},
|
||||
{item => ["$editor ~/.config/obmenu-generator/schema.pl", 'Menu Schema', $editor]},
|
||||
{item => ["$editor ~/.config/obmenu-generator/config.pl", 'Menu Config', $editor]},
|
||||
|
||||
{sep => undef},
|
||||
{item => ['obmenu-generator -p', 'Generate a pipe menu', 'menu-editor']},
|
||||
{item => ['obmenu-generator -s', 'Generate a static menu', 'menu-editor']},
|
||||
{item => ['obmenu-generator -p -i', 'Generate a pipe menu with icons', 'menu-editor']},
|
||||
{item => ['obmenu-generator -s -i', 'Generate a static menu with icons', 'menu-editor']},
|
||||
{sep => undef},
|
||||
|
||||
{item => ['obmenu-generator -d', 'Refresh Icon Set', 'gtk-refresh']},
|
||||
{end_cat => undef},
|
||||
|
||||
# Openbox category
|
||||
{begin_cat => ['Openbox', 'openbox']},
|
||||
{item => ['openbox --reconfigure', 'Reconfigure Openbox', 'openbox']},
|
||||
{item => ["$editor ~/.config/openbox/autostart", 'Openbox Autostart', $editor]},
|
||||
{item => ["$editor ~/.config/openbox/rc.xml", 'Openbox RC', $editor]},
|
||||
{item => ["$editor ~/.config/openbox/menu.xml", 'Openbox Menu', $editor]},
|
||||
{end_cat => undef},
|
||||
{end_cat => undef},
|
||||
{sep => undef},
|
||||
|
||||
# This options uses the default Openbox's action "Exit"
|
||||
{item => ['oblogout', 'Exit', 'exit']},
|
||||
]
|
||||
@@ -0,0 +1,112 @@
|
||||
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>openbox</Name>
|
||||
<Homepage>http://openbox.org</Homepage>
|
||||
<Packager>
|
||||
<Name>Pisi Linux Admins</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>GPLv2</License>
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>A standarts compliant, fast, lightweight window manager</Summary>
|
||||
<Description>Openbox is a window manager for the X11 windowing system.</Description>
|
||||
<Archive sha1sum="0a1b878cc5a64bcf2488dbd19260554a22f4dac2" type="targz">http://openbox.org/dist/openbox/openbox-3.6.1.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>pango-devel</Dependency>
|
||||
<Dependency>libXft-devel</Dependency>
|
||||
<Dependency>libICE-devel</Dependency>
|
||||
<Dependency>imlib2-devel</Dependency>
|
||||
<Dependency>libxml2-devel</Dependency>
|
||||
<Dependency>libSM-devel</Dependency>
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>libXrandr-devel</Dependency>
|
||||
<Dependency>libXcursor-devel</Dependency>
|
||||
<Dependency>libXinerama-devel</Dependency>
|
||||
<Dependency>startup-notification-devel</Dependency>
|
||||
<Dependency>dbus-devel</Dependency>
|
||||
<Dependency>librsvg-devel</Dependency>
|
||||
<!-- <Dependency>python-pyxdg</Dependency> -->
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>openbox-3.5.0-which-2.20.patch</Patch>
|
||||
<Patch>openbox-3.5.0-title-matching.patch</Patch>
|
||||
<Patch>openbox-default-theme.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>openbox</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>cairo</Dependency>
|
||||
<Dependency>glib2</Dependency>
|
||||
<Dependency>pango</Dependency>
|
||||
<Dependency>libSM</Dependency>
|
||||
<Dependency>libXft</Dependency>
|
||||
<Dependency>libICE</Dependency>
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>imlib2</Dependency>
|
||||
<Dependency>libXext</Dependency>
|
||||
<Dependency>libxml2</Dependency>
|
||||
<Dependency>librsvg</Dependency>
|
||||
<Dependency>libXrandr</Dependency>
|
||||
<Dependency>libXcursor</Dependency>
|
||||
<Dependency>libXinerama</Dependency>
|
||||
<Dependency>startup-notification</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="executable">/usr/libexec</Path>
|
||||
<Path fileType="config">/etc/xdg/openbox</Path>
|
||||
<Path fileType="config">/etc/xdg/obmenu-generator</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="data">/usr/share/openbox</Path>
|
||||
<Path fileType="data">/usr/share/themes</Path>
|
||||
<Path fileType="data">/usr/share/xsessions</Path>
|
||||
<Path fileType="data">/usr/share/gnome</Path>
|
||||
<Path fileType="data">/usr/share/gnome-session</Path>
|
||||
<Path fileType="data">/usr/share/applications</Path>
|
||||
<Path fileType="data">/usr/share/pixmaps</Path>
|
||||
<Path fileType="localedata">/usr/share/locale</Path>
|
||||
<Path fileType="man">/usr/share/man</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile owner="root" permission="0755" target="/usr/bin/obmenu-generator">obmenu-generator</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0755" target="/etc/xdg/obmenu-generator/schema.pl">schema.pl</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/xdg/openbox/menu.xml">menu.xml</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/xdg/openbox/autostart">autostart</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/usr/share/openbox/kedicik.png">kedicik.png</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>openbox-devel</Name>
|
||||
<Summary>Development headers for openbox</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">openbox</Dependency>
|
||||
<Dependency>pango-devel</Dependency>
|
||||
<Dependency>glib2-devel</Dependency>
|
||||
<Dependency>libxml2-devel</Dependency>
|
||||
<Dependency>libXft-devel</Dependency>
|
||||
<Dependency>imlib2-devel</Dependency>
|
||||
<Dependency>librsvg-devel</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>2015-07-24</Date>
|
||||
<Version>3.6.1</Version>
|
||||
<Comment>First release.</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>openbox</Name>
|
||||
<Summary xml:lang="tr">Standartlara uygun, hızlı, hafif bir pencere yöneticisi</Summary>
|
||||
<Description xml:lang="tr">Openbox, X11 pencere sistemi için pencere yöneticisidir. </Description>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>openbox-devel</Name>
|
||||
<Summary xml:lang="tr">Openbox için geliştirme başlıkları</Summary>
|
||||
</Package>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user