Merge pull request #41 from giresun28/master

vlc,libvlc,poppler-*.güncellendi, dvdauthor.paketlendi
This commit is contained in:
Milis İşletim Sistemi 2016-07-29 08:41:06 +00:00 committed by GitHub
commit 549ddef1cf
10 changed files with 265 additions and 34 deletions

View File

@ -0,0 +1,162 @@
From 5b890b47aaf6f692c876faf435e6bf8990e7a45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 19 Jul 2014 21:06:58 +0300
Subject: [PATCH] compat.h needs stuff from config.h so include it there
This was brought up by dvdvml.* not including it and thus causing a
build failure on Fedora (22) devel. While at it, uninclude config.h
from files where it was included just for compat.h reasons.
---
src/compat.h | 2 ++
src/conffile.c | 1 -
src/dvdauthor.c | 2 --
src/dvdcompile.c | 2 --
src/dvdpgc.c | 1 -
src/dvdunauthor.c | 2 --
src/dvduncompile.c | 1 -
src/dvdvob.c | 2 --
src/readxml.c | 2 --
src/spuunmux.c | 1 -
src/subgen-encode.c | 2 --
11 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/compat.h b/src/compat.h
index 126dcd7..93de081 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -1,6 +1,8 @@
// basic headers
#define _GNU_SOURCE /* really just for strndup */
+#include "config.h"
+
#ifdef HAVE_STDBOOL_H
# include <stdbool.h>
#else
diff --git a/src/conffile.c b/src/conffile.c
index cab661a..36ded07 100644
--- a/src/conffile.c
+++ b/src/conffile.c
@@ -21,7 +21,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
#include "compat.h"
#include <errno.h>
#include "conffile.h"
diff --git a/src/dvdauthor.c b/src/dvdauthor.c
index d591d68..4860258 100644
--- a/src/dvdauthor.c
+++ b/src/dvdauthor.c
@@ -20,8 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <sys/types.h>
diff --git a/src/dvdcompile.c b/src/dvdcompile.c
index fd232b6..47f13e5 100644
--- a/src/dvdcompile.c
+++ b/src/dvdcompile.c
@@ -20,8 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <assert.h>
diff --git a/src/dvdpgc.c b/src/dvdpgc.c
index e0adc61..cf6eb04 100644
--- a/src/dvdpgc.c
+++ b/src/dvdpgc.c
@@ -20,7 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
#include "compat.h"
#include <errno.h>
#include <assert.h>
diff --git a/src/dvdunauthor.c b/src/dvdunauthor.c
index ccd422f..f988cdf 100644
--- a/src/dvdunauthor.c
+++ b/src/dvdunauthor.c
@@ -23,8 +23,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <ctype.h>
diff --git a/src/dvduncompile.c b/src/dvduncompile.c
index 0c5eaf1..a064011 100644
--- a/src/dvduncompile.c
+++ b/src/dvduncompile.c
@@ -22,7 +22,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
#include "compat.h"
#include <stdio.h>
diff --git a/src/dvdvob.c b/src/dvdvob.c
index 2d7e2b8..2146689 100644
--- a/src/dvdvob.c
+++ b/src/dvdvob.c
@@ -20,8 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <assert.h>
diff --git a/src/readxml.c b/src/readxml.c
index 61ff0a1..3b83f07 100644
--- a/src/readxml.c
+++ b/src/readxml.c
@@ -20,8 +20,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <assert.h>
diff --git a/src/spuunmux.c b/src/spuunmux.c
index 1981e41..94fcb10 100644
--- a/src/spuunmux.c
+++ b/src/spuunmux.c
@@ -31,7 +31,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
#include "compat.h"
#include <fcntl.h>
diff --git a/src/subgen-encode.c b/src/subgen-encode.c
index 53ed4b2..962e902 100644
--- a/src/subgen-encode.c
+++ b/src/subgen-encode.c
@@ -21,8 +21,6 @@
* MA 02110-1301 USA.
*/
-#include "config.h"
-
#include "compat.h"
#include <assert.h>

View File

@ -0,0 +1,23 @@
# Description: DVD authoring tools.
# URL: http://dvdauthor.sourceforge.net/
# Packager: alihan-ozturk28@hotmail.com
# Depends on: libxml2 libdvdnav libpng fribidi freetype
name=dvdauthor
version=0.7.1
release=2
source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz
dvdauthor-0.7.1-glibc220.patch)
build() {
cd $name
patch -p1 -i $SRC/dvdauthor-0.7.1-glibc220.patch
./configure \
--prefix=/usr \
--mandir=/usr/man
make
make DESTDIR=$PKG install
}

View File

@ -0,0 +1,30 @@
commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23
Author: Vinson Lee <vlee@freedesktop.org>
Date: Thu Feb 5 14:48:53 2015 -0800
lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility.
In Lua 5.3.0, luaL_checkint was deprecated.
This patch fixes this build error with Lua 5.3.0.
lua/demux.c: In function vlclua_demux_peek:
lua/demux.c:55:5: error: implicit declaration of function luaL_checkint [-Werror=implicit-function-declaration]
int n = luaL_checkint( L, 1 );
^
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h
index efd94f1..85c7fc1 100644
--- a/modules/lua/vlc.h
+++ b/modules/lua/vlc.h
@@ -38,6 +38,7 @@
#include <vlc_stream.h>
#include <vlc_demux.h>
+#define LUA_COMPAT_APIINTCASTS
#define LUA_COMPAT_MODULE
#include <lua.h> /* Low level lua C API */
#include <lauxlib.h> /* Higher level C API */

View File

@ -1,23 +1,27 @@
# Description: Library from vlc
# URL: http://www.slackware.com/~alien/slackbuilds/vlc/
# Packager: tnut at nutyx dot org
# Depends on: glib dbus libidn alsa-lib libmad
# Depends on: libbluray opus qt5 x264 flac libmad glib librsvg alsa-lib xorg-libxinerama xorg-libxpm libvpx libcdio vcdimager live libdvdcss libdvdread libdvdnav libogg libtheora lame faac libvorbis ffmpeg faad2 liba52 libmpeg2 libmpcdec fribidi lua libdv speex
name=libvlc
version=2.2.1
release=1
version=3.0.0
release=20160606
source=( http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz)
source=( http://anduin.linuxfromscratch.org/BLFS/vlc/vlc-$version-$release.tar.xz
lua53_compat.patch)
build() {
cd vlc-$version
cd vlc-$version-$release
sed -i '/seems to be moved/s/^/#/' autotools/ltmain.sh
BUILDCC=gcc \
./configure --prefix=/usr \
--disable-swscale \
--disable-lua \
--disable-a52 \
--disable-avcodec
--sysconfdir=/etc \
--enable-bluray \
--enable-opus \
RCC=/usr/bin/rcc-qt5
make
make DESTDIR=$PKG install

View File

@ -1,9 +1,10 @@
# Description: PDF rendering library based on xpdf 3.0
# URL: URL: http://poppler.freedesktop.org/
# Packager: alienus at nutyx dot org
# Packager: alihan-ozturk28@hotmail.com
# Depends on: poppler xorg-libxxf86vm libpng xorg-fontconfig libjpeg-turbo cairo libxml2 openjpeg lcms lcms2 glib
name=poppler-glib
version=0.46.0
release=1
source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)
@ -11,6 +12,8 @@ source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)
build() {
cd poppler-$version
CXXFLAGS="-std=c++11"
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \

View File

@ -1,15 +1,19 @@
# Description: PDF rendering library based on xpdf 3.0
# URL: URL: http://poppler.freedesktop.org/
# Packager: alienus at nutyx dot org
# Packager: alihan-ozturk28@hotmail.com
# Depends on: poppler xorg-libxxf86vm libpng xorg-fontconfig libjpeg-turbo cairo libxml2 openjpeg lcms lcms2 qt4
name=poppler-qt4
version=0.46.0
release=1
source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)
build() {
cd poppler-$version
CXXFLAGS="-std=c++11"
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \

View File

@ -4,16 +4,20 @@
# Depends on: poppler xorg-libxxf86vm libpng xorg-fontconfig libjpeg-turbo cairo libxml2 openjpeg lcms lcms2 qt5
name=poppler-qt5
version=0.41.0
version=0.46.0
release=1
source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)
build() {
cd poppler-$version
CXXFLAGS="-std=c++11"
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-cmyk \
--enable-qt5 \
--disable-qt4 \
--disable-glib \

View File

@ -5,7 +5,7 @@
dataversion=0.4.7
name=poppler
version=0.41.0
version=0.46.0
release=1
source=(
@ -15,11 +15,13 @@ http://poppler.freedesktop.org/poppler-data-$dataversion.tar.gz)
build() {
cd poppler-$version
CXXFLAGS="-std=c++11"
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--enable-build-type=release \
--enable-cmyk \
--enable-cmyk \
--enable-xpdf-headers
make

View File

@ -1,17 +1,17 @@
# Description: A qt-based library that maps JSON data to QVariant objects
# URL: http://qjson.sourceforge.net
# Packager: pierre at nutyx dot org
# Depends on: qt4
# Packager: alihan-ozturk28@hotmail.com
# Depends on: cmake qt5
name=qjson
version=0.8.1
version=0.8.2
release=1
source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2 )
source=( http://source.pisilinux.org/1.0/qjson-0.82_d0f62e65.tar.gz)
build() {
cd $name-$version
cd $name
mkdir build
cd build
cmake .. \

View File

@ -2,36 +2,35 @@
# URL: http://www.videolan.org/vlc/
# Maintainer: Thomas Penteker, tek at serverop dot de
# Packager: milisarge@gmail.com
# Depends on: libvlc qt5 x264 flac libmad glib librsvg alsa-lib xorg-libxinerama xorg-libxpm libvpx libcdio vcdimager live libdvdcss libdvdread libdvdnav libogg libtheora lame faac libvorbis ffmpeg faad2 liba52 libmpeg2 libmpcdec fribidi lua libdv speex
# Depends on: libbluray opus qt5 x264 flac libmad glib librsvg alsa-lib xorg-libxinerama xorg-libxpm libvpx libcdio vcdimager live libdvdcss libdvdread libdvdnav libogg libtheora lame faac libvorbis ffmpeg faad2 liba52 libmpeg2 libmpcdec fribidi lua libdv speex
name=vlc
version=2.2.4
version=3.0.0
_version=20160606
release=1
source=(http://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.xz
lua53_compat.patch
update-vlc-plugin-cache.hook)
source=( http://anduin.linuxfromscratch.org/BLFS/$name/$name-$version-${_version}.tar.xz
lua53_compat.patch
update-vlc-plugin-cache.hook)
build() {
cd $name-$version
cd $name-$version-${_version}
patch -Np1 -i ../lua53_compat.patch
sed -i 's:libsmbclient.h:samba-4.0/&:' modules/access/smb.c
sed -i '/seems to be moved/s/^/#/' autotools/ltmain.sh
sh bootstrap
BUILDCC=gcc \
./configure --prefix=/usr \
--sysconfdir=/etc \
--enable-bluray \
--enable-opus \
RCC=/usr/bin/rcc-qt5
sed -i 's/luaL_optint/(int)&eger/' modules/lua/libs/{net,osd,volume}.c
sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \
modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c
make
make DESTDIR=$PKG docdir=/usr/share/doc/$name-$version install
install -Dm644 ../update-vlc-plugin-cache.hook $PKG/usr/share/libalpm/hooks/update-vlc-plugin-cache.hook
rm -rf $PKG/usr/share/doc
# fix desktop file
sed -i 's/--started-from-file//g' $PKG/usr/share/applications/vlc.desktop
}