[arch-commits] Commit in bluegriffon/repos (14 files)
Fabio Castelli
muflone at archlinux.org
Sat Apr 18 23:00:07 UTC 2015
Date: Sunday, April 19, 2015 @ 01:00:06
Author: muflone
Revision: 131654
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
bluegriffon/repos/staging-i686/
bluegriffon/repos/staging-i686/PKGBUILD
(from rev 131653, bluegriffon/trunk/PKGBUILD)
bluegriffon/repos/staging-i686/bluegriffon.desktop
(from rev 131653, bluegriffon/trunk/bluegriffon.desktop)
bluegriffon/repos/staging-i686/bluegriffon.install
(from rev 131653, bluegriffon/trunk/bluegriffon.install)
bluegriffon/repos/staging-i686/freetype.patch
(from rev 131653, bluegriffon/trunk/freetype.patch)
bluegriffon/repos/staging-i686/libvpx_1.4.patch
(from rev 131653, bluegriffon/trunk/libvpx_1.4.patch)
bluegriffon/repos/staging-i686/mozconfig
(from rev 131653, bluegriffon/trunk/mozconfig)
bluegriffon/repos/staging-x86_64/
bluegriffon/repos/staging-x86_64/PKGBUILD
(from rev 131653, bluegriffon/trunk/PKGBUILD)
bluegriffon/repos/staging-x86_64/bluegriffon.desktop
(from rev 131653, bluegriffon/trunk/bluegriffon.desktop)
bluegriffon/repos/staging-x86_64/bluegriffon.install
(from rev 131653, bluegriffon/trunk/bluegriffon.install)
bluegriffon/repos/staging-x86_64/freetype.patch
(from rev 131653, bluegriffon/trunk/freetype.patch)
bluegriffon/repos/staging-x86_64/libvpx_1.4.patch
(from rev 131653, bluegriffon/trunk/libvpx_1.4.patch)
bluegriffon/repos/staging-x86_64/mozconfig
(from rev 131653, bluegriffon/trunk/mozconfig)
------------------------------------+
staging-i686/PKGBUILD | 90 +++++++++++++++++++++++++++++++++++
staging-i686/bluegriffon.desktop | 16 ++++++
staging-i686/bluegriffon.install | 12 ++++
staging-i686/freetype.patch | 74 ++++++++++++++++++++++++++++
staging-i686/libvpx_1.4.patch | 25 +++++++++
staging-i686/mozconfig | 37 ++++++++++++++
staging-x86_64/PKGBUILD | 90 +++++++++++++++++++++++++++++++++++
staging-x86_64/bluegriffon.desktop | 16 ++++++
staging-x86_64/bluegriffon.install | 12 ++++
staging-x86_64/freetype.patch | 74 ++++++++++++++++++++++++++++
staging-x86_64/libvpx_1.4.patch | 25 +++++++++
staging-x86_64/mozconfig | 37 ++++++++++++++
12 files changed, 508 insertions(+)
Copied: bluegriffon/repos/staging-i686/PKGBUILD (from rev 131653, bluegriffon/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=bluegriffon
+pkgver=1.7.2
+_mozilla_ver=9db46ddfb517
+pkgrel=2
+pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox"
+arch=('i686' 'x86_64')
+url="http://bluegriffon.org/"
+license=('MPL' 'GPL' 'LGPL')
+depends=('alsa-lib' 'desktop-file-utils' 'dbus-glib' 'gtk2' 'hunspell' 'mozilla-common'
+ 'nss' 'libevent' 'libvpx' 'libxt' 'python2' 'startup-notification')
+makedepends=('autoconf2.13' 'libpulse' 'subversion' 'unzip' 'xorg-server-xvfb' 'zip')
+options=('!emptydirs')
+install="${pkgname}.install"
+source=("${pkgname}-${pkgver}"::"svn+http://sources.disruptive-innovations.com/${pkgname}/tags/${pkgver}"
+ "${pkgname}-l10n-${pkgver}"::"svn+http://sources.disruptive-innovations.com/${pkgname}-l10n/tags/${pkgver}"
+ "http://hg.mozilla.org/mozilla-central/archive/${_mozilla_ver}.tar.bz2"
+ "mozconfig"
+ "bluegriffon.desktop"
+ "freetype.patch"
+ "libvpx_1.4.patch")
+sha256sums=('SKIP'
+ 'SKIP'
+ '427814daeb87605eb94a3ed64b05383b0dcbe76a742efa845fb29722fcb2737f'
+ '02d87cb754fd6532bf78d461e822b271ae135df27afd1f48d1978aa0372840b1'
+ '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff'
+ '431c97f6b6d0c10d026e2d6d848e7c1bb0a7a55912199909f17ce485a8dc484e'
+ '4a5aa3dc46a6e6a0344e703ade97842935337d4304751f8073b365b44b3162bc')
+
+prepare() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # Move files to their correct location
+ mv "${srcdir}/${pkgname}-${pkgver}" bluegriffon
+ mv "${srcdir}/${pkgname}-l10n-${pkgver}" bluegriffon/locales
+ mv "${srcdir}/mozconfig" .mozconfig
+
+ # Apply BlueGriffon's upstream customizations
+ patch -Np1 -i bluegriffon/config/content.patch
+
+ # Fix build with freetype 2.5
+ patch -Np1 -i ../freetype.patch
+
+ # Fix build with libvpx >= 1.4
+ patch -Np1 -i ../libvpx_1.4.patch
+
+ # python2 fix
+ find . -name \*.py -exec sed -i 's@^#.*python$@#!/usr/bin/python2@' '{}' \;
+}
+
+build() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # configure script misdetects the preprocessor without an optimization level
+ # https://bugs.archlinux.org/task/34644
+ export CPPFLAGS+=' -O2'
+ export PYTHON=python2
+
+ xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \
+ make -f client.mk build
+}
+
+package() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ mkdir -p "${pkgdir}/usr/lib/bluegriffon"
+ cp -LR bg/dist/bin/* "${pkgdir}/usr/lib/bluegriffon"
+
+ mkdir -p "${pkgdir}/usr/bin"
+ ln -sf /usr/lib/bluegriffon/bluegriffon "${pkgdir}/usr/bin/bluegriffon"
+
+ for i in 16x16 32x32 48x48; do
+ install -Dm644 bg/dist/branding/default${i/x*/}.png \
+ "${pkgdir}/usr/share/icons/hicolor/${i}/apps/bluegriffon.png"
+ done
+
+ install -Dm644 bg/dist/branding/mozicon128.png \
+ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/bluegriffon.png"
+
+ install -Dm644 ../bluegriffon.desktop \
+ "${pkgdir}/usr/share/applications/bluegriffon.desktop"
+
+ # Use system-provided dictionaries
+ rm -rf "${pkgdir}"/usr/lib/bluegriffon/{dictionaries,hyphenation}
+ ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/bluegriffon/dictionaries"
+ ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/bluegriffon/hyphenation"
+}
Copied: bluegriffon/repos/staging-i686/bluegriffon.desktop (from rev 131653, bluegriffon/trunk/bluegriffon.desktop)
===================================================================
--- staging-i686/bluegriffon.desktop (rev 0)
+++ staging-i686/bluegriffon.desktop 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=BlueGriffon
+GenericName=Web Editor
+GenericName[hu]=Webszerkesztő
+X-GNOME-FullName=BlueGriffon Web Editor
+X-GNOME-FullName[hu]=BlueGriffon webszerkesztő
+Comment=Create Web Pages
+Comment[es]=Crea páginas web
+Comment[hu]=Weboldalak készítése
+Comment[it]=Creare pagine Web
+Categories=Development;WebDevelopment;
+Exec=bluegriffon
+Icon=bluegriffon
+Terminal=false
+MimeType=text/html;application/xhtml+xml;
+Type=Application
Copied: bluegriffon/repos/staging-i686/bluegriffon.install (from rev 131653, bluegriffon/trunk/bluegriffon.install)
===================================================================
--- staging-i686/bluegriffon.install (rev 0)
+++ staging-i686/bluegriffon.install 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: bluegriffon/repos/staging-i686/freetype.patch (from rev 131653, bluegriffon/trunk/freetype.patch)
===================================================================
--- staging-i686/freetype.patch (rev 0)
+++ staging-i686/freetype.patch 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,74 @@
+Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
+Date: 2013-11-29
+Initial Package Version: 25.0.1
+Upstream Status: Submitted
+Origin: mozilla
+URL: https://bug944454.bugzilla.mozilla.org/attachment.cgi?id=8340117
+Description: Fixes build with FreeType-2.5.1
+
+diff --git a/config/system-headers b/config/system-headers
+--- a/config/system-headers
++++ b/config/system-headers
+@@ -408,16 +408,29 @@ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+ fstream.h
+ ft2build.h
+ fts.h
+ gconf/gconf-client.h
+ Gdiplus.h
+diff --git a/js/src/config/system-headers b/js/src/config/system-headers
+--- a/js/src/config/system-headers
++++ b/js/src/config/system-headers
+@@ -408,16 +408,29 @@ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+ fstream.h
+ ft2build.h
+ fts.h
+ gconf/gconf-client.h
+ Gdiplus.h
Copied: bluegriffon/repos/staging-i686/libvpx_1.4.patch (from rev 131653, bluegriffon/trunk/libvpx_1.4.patch)
===================================================================
--- staging-i686/libvpx_1.4.patch (rev 0)
+++ staging-i686/libvpx_1.4.patch 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,25 @@
+diff -Naur mozilla-central-9db46ddfb517.orig/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc mozilla-central-9db46ddfb517/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+--- mozilla-central-9db46ddfb517.orig/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2013-04-09 21:29:13.000000000 +0200
++++ mozilla-central-9db46ddfb517/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-18 20:20:47.298270190 +0200
+@@ -178,7 +178,7 @@
+ // Creating a wrapper to the image - setting image data to NULL. Actual
+ // pointer will be set in encode. Setting align to 1, as it is meaningless
+ // (actual memory is not allocated).
+- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
++ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
+ 1, NULL);
+ // populate encoder configuration with default values
+ if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
+@@ -352,9 +352,9 @@
+ }
+ // Image in vpx_image_t format.
+ // Input image is const. VP8's raw image is not defined as const.
+- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
+- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
+- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
++ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
++ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
++ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
+ // TODO(mikhal): Stride should be set in initialization.
+ raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
+ raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
Copied: bluegriffon/repos/staging-i686/mozconfig (from rev 131653, bluegriffon/trunk/mozconfig)
===================================================================
--- staging-i686/mozconfig (rev 0)
+++ staging-i686/mozconfig 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,37 @@
+# Select BlueGriffon
+mk_add_options MOZ_TOOLKIT_SEARCH=
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/bg
+ac_add_options --enable-application=bluegriffon
+
+# System directories
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+#ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-pulseaudio
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-installer
+ac_add_options --disable-debug-symbols
+
+# Optimization
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+mk_add_options MOZ_MAKE_FLAGS="-s -j4"
Copied: bluegriffon/repos/staging-x86_64/PKGBUILD (from rev 131653, bluegriffon/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=bluegriffon
+pkgver=1.7.2
+_mozilla_ver=9db46ddfb517
+pkgrel=2
+pkgdesc="The next-generation Web Editor based on the rendering engine of Firefox"
+arch=('i686' 'x86_64')
+url="http://bluegriffon.org/"
+license=('MPL' 'GPL' 'LGPL')
+depends=('alsa-lib' 'desktop-file-utils' 'dbus-glib' 'gtk2' 'hunspell' 'mozilla-common'
+ 'nss' 'libevent' 'libvpx' 'libxt' 'python2' 'startup-notification')
+makedepends=('autoconf2.13' 'libpulse' 'subversion' 'unzip' 'xorg-server-xvfb' 'zip')
+options=('!emptydirs')
+install="${pkgname}.install"
+source=("${pkgname}-${pkgver}"::"svn+http://sources.disruptive-innovations.com/${pkgname}/tags/${pkgver}"
+ "${pkgname}-l10n-${pkgver}"::"svn+http://sources.disruptive-innovations.com/${pkgname}-l10n/tags/${pkgver}"
+ "http://hg.mozilla.org/mozilla-central/archive/${_mozilla_ver}.tar.bz2"
+ "mozconfig"
+ "bluegriffon.desktop"
+ "freetype.patch"
+ "libvpx_1.4.patch")
+sha256sums=('SKIP'
+ 'SKIP'
+ '427814daeb87605eb94a3ed64b05383b0dcbe76a742efa845fb29722fcb2737f'
+ '02d87cb754fd6532bf78d461e822b271ae135df27afd1f48d1978aa0372840b1'
+ '882133b77840356985a81e496b4ddc443f8f33c068cfb7ef0858497820adcfff'
+ '431c97f6b6d0c10d026e2d6d848e7c1bb0a7a55912199909f17ce485a8dc484e'
+ '4a5aa3dc46a6e6a0344e703ade97842935337d4304751f8073b365b44b3162bc')
+
+prepare() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # Move files to their correct location
+ mv "${srcdir}/${pkgname}-${pkgver}" bluegriffon
+ mv "${srcdir}/${pkgname}-l10n-${pkgver}" bluegriffon/locales
+ mv "${srcdir}/mozconfig" .mozconfig
+
+ # Apply BlueGriffon's upstream customizations
+ patch -Np1 -i bluegriffon/config/content.patch
+
+ # Fix build with freetype 2.5
+ patch -Np1 -i ../freetype.patch
+
+ # Fix build with libvpx >= 1.4
+ patch -Np1 -i ../libvpx_1.4.patch
+
+ # python2 fix
+ find . -name \*.py -exec sed -i 's@^#.*python$@#!/usr/bin/python2@' '{}' \;
+}
+
+build() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ # configure script misdetects the preprocessor without an optimization level
+ # https://bugs.archlinux.org/task/34644
+ export CPPFLAGS+=' -O2'
+ export PYTHON=python2
+
+ xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \
+ make -f client.mk build
+}
+
+package() {
+ cd "${srcdir}/mozilla-central-${_mozilla_ver}"
+
+ mkdir -p "${pkgdir}/usr/lib/bluegriffon"
+ cp -LR bg/dist/bin/* "${pkgdir}/usr/lib/bluegriffon"
+
+ mkdir -p "${pkgdir}/usr/bin"
+ ln -sf /usr/lib/bluegriffon/bluegriffon "${pkgdir}/usr/bin/bluegriffon"
+
+ for i in 16x16 32x32 48x48; do
+ install -Dm644 bg/dist/branding/default${i/x*/}.png \
+ "${pkgdir}/usr/share/icons/hicolor/${i}/apps/bluegriffon.png"
+ done
+
+ install -Dm644 bg/dist/branding/mozicon128.png \
+ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/bluegriffon.png"
+
+ install -Dm644 ../bluegriffon.desktop \
+ "${pkgdir}/usr/share/applications/bluegriffon.desktop"
+
+ # Use system-provided dictionaries
+ rm -rf "${pkgdir}"/usr/lib/bluegriffon/{dictionaries,hyphenation}
+ ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/bluegriffon/dictionaries"
+ ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/bluegriffon/hyphenation"
+}
Copied: bluegriffon/repos/staging-x86_64/bluegriffon.desktop (from rev 131653, bluegriffon/trunk/bluegriffon.desktop)
===================================================================
--- staging-x86_64/bluegriffon.desktop (rev 0)
+++ staging-x86_64/bluegriffon.desktop 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=BlueGriffon
+GenericName=Web Editor
+GenericName[hu]=Webszerkesztő
+X-GNOME-FullName=BlueGriffon Web Editor
+X-GNOME-FullName[hu]=BlueGriffon webszerkesztő
+Comment=Create Web Pages
+Comment[es]=Crea páginas web
+Comment[hu]=Weboldalak készítése
+Comment[it]=Creare pagine Web
+Categories=Development;WebDevelopment;
+Exec=bluegriffon
+Icon=bluegriffon
+Terminal=false
+MimeType=text/html;application/xhtml+xml;
+Type=Application
Copied: bluegriffon/repos/staging-x86_64/bluegriffon.install (from rev 131653, bluegriffon/trunk/bluegriffon.install)
===================================================================
--- staging-x86_64/bluegriffon.install (rev 0)
+++ staging-x86_64/bluegriffon.install 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: bluegriffon/repos/staging-x86_64/freetype.patch (from rev 131653, bluegriffon/trunk/freetype.patch)
===================================================================
--- staging-x86_64/freetype.patch (rev 0)
+++ staging-x86_64/freetype.patch 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,74 @@
+Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
+Date: 2013-11-29
+Initial Package Version: 25.0.1
+Upstream Status: Submitted
+Origin: mozilla
+URL: https://bug944454.bugzilla.mozilla.org/attachment.cgi?id=8340117
+Description: Fixes build with FreeType-2.5.1
+
+diff --git a/config/system-headers b/config/system-headers
+--- a/config/system-headers
++++ b/config/system-headers
+@@ -408,16 +408,29 @@ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+ fstream.h
+ ft2build.h
+ fts.h
+ gconf/gconf-client.h
+ Gdiplus.h
+diff --git a/js/src/config/system-headers b/js/src/config/system-headers
+--- a/js/src/config/system-headers
++++ b/js/src/config/system-headers
+@@ -408,16 +408,29 @@ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+ freetype/ftadvanc.h
+ freetype/ftbitmap.h
+ freetype/ftxf86.h
++freetype.h
++ftcache.h
++ftglyph.h
++ftsynth.h
++ftoutln.h
++ttnameid.h
++tttables.h
++t1tables.h
++ftlcdfil.h
++ftsizes.h
++ftadvanc.h
++ftbitmap.h
++ftxf86.h
+ fribidi/fribidi.h
+ FSp_fopen.h
+ fstream
+ fstream.h
+ ft2build.h
+ fts.h
+ gconf/gconf-client.h
+ Gdiplus.h
Copied: bluegriffon/repos/staging-x86_64/libvpx_1.4.patch (from rev 131653, bluegriffon/trunk/libvpx_1.4.patch)
===================================================================
--- staging-x86_64/libvpx_1.4.patch (rev 0)
+++ staging-x86_64/libvpx_1.4.patch 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,25 @@
+diff -Naur mozilla-central-9db46ddfb517.orig/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc mozilla-central-9db46ddfb517/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+--- mozilla-central-9db46ddfb517.orig/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2013-04-09 21:29:13.000000000 +0200
++++ mozilla-central-9db46ddfb517/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-04-18 20:20:47.298270190 +0200
+@@ -178,7 +178,7 @@
+ // Creating a wrapper to the image - setting image data to NULL. Actual
+ // pointer will be set in encode. Setting align to 1, as it is meaningless
+ // (actual memory is not allocated).
+- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height,
++ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height,
+ 1, NULL);
+ // populate encoder configuration with default values
+ if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) {
+@@ -352,9 +352,9 @@
+ }
+ // Image in vpx_image_t format.
+ // Input image is const. VP8's raw image is not defined as const.
+- raw_->planes[PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
+- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
+- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
++ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
++ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
++ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
+ // TODO(mikhal): Stride should be set in initialization.
+ raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane);
+ raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane);
Copied: bluegriffon/repos/staging-x86_64/mozconfig (from rev 131653, bluegriffon/trunk/mozconfig)
===================================================================
--- staging-x86_64/mozconfig (rev 0)
+++ staging-x86_64/mozconfig 2015-04-18 23:00:06 UTC (rev 131654)
@@ -0,0 +1,37 @@
+# Select BlueGriffon
+mk_add_options MOZ_TOOLKIT_SEARCH=
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/bg
+ac_add_options --enable-application=bluegriffon
+
+# System directories
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+#ac_add_options --enable-system-ffi
+#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-pulseaudio
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-installer
+ac_add_options --disable-debug-symbols
+
+# Optimization
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+mk_add_options MOZ_MAKE_FLAGS="-s -j4"
More information about the arch-commits
mailing list