July 2015 - crux-commits

ports/opt (3.2): elilo: moved from contrib
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit 7496c5f6d7d61be81db36ffc01c9bd1b45383f03 Author: Thomas Penteker <tek(a)serverop.de> Date: Tue Jul 21 22:43:15 2015 +0200 elilo: moved from contrib diff --git a/elilo/.footprint b/elilo/.footprint new file mode 100644 index 0000000..7289b58 --- /dev/null +++ b/elilo/.footprint @@ -0,0 +1,6 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/sbin/ +-rwxr-xr-x root/root usr/sbin/eliloalt +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/elilo/ +-rwxr-xr-x root/root usr/share/elilo/elilo.efi diff --git a/elilo/.md5sum b/elilo/.md5sum new file mode 100644 index 0000000..858c37a --- /dev/null +++ b/elilo/.md5sum @@ -0,0 +1 @@ +31ae4652b0bd4580b37640054e7146bc elilo-3.16-all.tar.gz diff --git a/elilo/Pkgfile b/elilo/Pkgfile new file mode 100644 index 0000000..12ca4e3 --- /dev/null +++ b/elilo/Pkgfile @@ -0,0 +1,20 @@ +# Description: ELILO EFI boot loader +# URL: http://elilo.sf.net/ +# Maintainer: Thomas Penteker, tek at serverop dot de +# Depends on: gnu-efi + +name=elilo +version=3.16 +release=1 +source=(http://download.sourceforge.net/${name}/${name}-${version}-all.tar.gz) +build() { + tar xzf elilo-$version-source.tar.gz + cd "${SRC}/elilo-${version}-source/" + #sed -i 's|-fno-stack-protector|-DGNU_EFI_USE_MS_ABI -fno-stack-protector|g' Make.defaults + #sed -i 's|DEBUGFLAGS = -Wall|DEBUGFLAGS = -Wall -Wno-error|g' Make.defaults + sed -i 's|dpkg-architecture -qDEB_BUILD_ARCH|uname -m|g' Make.defaults + + make -j1 + install -D elilo.efi $PKG/usr/share/elilo/elilo.efi + install -D tools/eliloalt $PKG/usr/sbin/eliloalt +} diff --git a/elilo/README b/elilo/README new file mode 100644 index 0000000..57baaed --- /dev/null +++ b/elilo/README @@ -0,0 +1,3 @@ +Note: for eliloalt to work you have to enable + CONFIG_EFI_VARS +in your kernel config.

1 0

ports/opt (3.2): thunderbird: additional dep cleanups
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit b496c1b980d0f32af5baff377ce21a2b669be782 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 19 14:37:19 2015 +0200 thunderbird: additional dep cleanups diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index b1fab5b..7e4d4ae 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -1,7 +1,7 @@ # Description: email client from the Mozilla project # URL: http://www.mozillamessaging.com/en-US/thunderbird/ # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu -# Depends on: python,gtk,alsa-lib,xorg-libxt,libidl,nss,dbus-glib,xorg-libxdamage,yasm,mesa3d,libjpeg-turbo +# Depends on: python,gtk,alsa-lib,xorg-libxt,libidl,nss,yasm,xorg-libxt,mesa3d,libjpeg-turbo name=thunderbird version=38.1.0

1 0

ports/opt (3.2): thunderbird: readded alsa-lib to deps
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit 92fbd46e3fdabb2b199e7341fc4ba4062de07b81 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 19 11:03:48 2015 +0200 thunderbird: readded alsa-lib to deps diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index 41b31d5..b1fab5b 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -1,7 +1,7 @@ # Description: email client from the Mozilla project # URL: http://www.mozillamessaging.com/en-US/thunderbird/ # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu -# Depends on: python gtk xorg-libxt libidl nss dbus-glib xorg-libxdamage yasm mesa3d libjpeg-turbo +# Depends on: python,gtk,alsa-lib,xorg-libxt,libidl,nss,dbus-glib,xorg-libxdamage,yasm,mesa3d,libjpeg-turbo name=thunderbird version=38.1.0

1 0

ports/opt (3.1): mysql-python: remove old patch
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit a504d0041ff4eb30c52c95a329cb88f7ca1d5efd Author: Juergen Daubert <jue(a)jue.li> Date: Fri Jul 24 16:26:43 2015 +0200 mysql-python: remove old patch diff --git a/mysql-python/mysql-python-setup.diff b/mysql-python/mysql-python-setup.diff deleted file mode 100644 index 2d43183..0000000 --- a/mysql-python/mysql-python-setup.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru MySQL-python-1.2.3.orig/setup.py MySQL-python-1.2.3/setup.py ---- MySQL-python-1.2.3.orig/setup.py 2010-06-17 15:05:12.954472025 +0200 -+++ MySQL-python-1.2.3/setup.py 2010-04-27 10:00:04.000000000 +0200 -@@ -2,6 +2,8 @@ - - import os - import sys -+from ez_setup import use_setuptools -+use_setuptools() - from setuptools import setup, Extension - - if not hasattr(sys, "hexversion") or sys.hexversion < 0x02030000:

1 0

ports/opt (3.1): mdadm: update to 3.3.3
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit 1971d9932d798854f548df9ab84ab207e02d0f24 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Jul 24 16:27:25 2015 +0200 mdadm: update to 3.3.3 diff --git a/mdadm/.md5sum b/mdadm/.md5sum index 004cfff..9d1b678 100644 --- a/mdadm/.md5sum +++ b/mdadm/.md5sum @@ -1 +1 @@ -44698d351501cac6a89072dc877eb220 mdadm-3.3.2.tar.xz +dabd5ce70f3fff340cad7c18e4a062ab mdadm-3.3.3.tar.xz diff --git a/mdadm/Pkgfile b/mdadm/Pkgfile index e60ca35..af511e0 100644 --- a/mdadm/Pkgfile +++ b/mdadm/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=mdadm -version=3.3.2 +version=3.3.3 release=1 source=(http://www.kernel.org/pub/linux/utils/raid/$name/$name-$version.tar…

1 0

ports/opt (3.1): apache: remove old patch
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit 77a14ec226f6b8402dc4ce13c93bac428de6fe1f Author: Juergen Daubert <jue(a)jue.li> Date: Fri Jul 24 16:25:21 2015 +0200 apache: remove old patch diff --git a/apache/apache-ssl_cert.patch b/apache/apache-ssl_cert.patch deleted file mode 100644 index 610f1fa..0000000 --- a/apache/apache-ssl_cert.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru httpd-2.2.26.orig/docs/conf/extra/httpd-ssl.conf.in httpd-2.2.26/docs/conf/extra/httpd-ssl.conf.in ---- httpd-2.2.26.orig/docs/conf/extra/httpd-ssl.conf.in 2013-11-17 10:46:25.992237273 +0100 -+++ httpd-2.2.26/docs/conf/extra/httpd-ssl.conf.in 2013-11-17 10:48:52.536996463 +0100 -@@ -117,7 +117,7 @@ - # Some ECC cipher suites (http://www.ietf.org/rfc/rfc4492.txt) - # require an ECC certificate which can also be configured in - # parallel. --SSLCertificateFile "@exp_sysconfdir@/server.crt" -+SSLCertificateFile "/etc/ssl/certs/apache.crt" - #SSLCertificateFile "@exp_sysconfdir@/server-dsa.crt" - #SSLCertificateFile "@exp_sysconfdir@/server-ecc.crt" - -@@ -127,7 +127,7 @@ - # you've both a RSA and a DSA private key you can configure - # both in parallel (to also allow the use of DSA ciphers, etc.) - # ECC keys, when in use, can also be configured in parallel --SSLCertificateKeyFile "@exp_sysconfdir@/server.key" -+SSLCertificateKeyFile "/etc/ssl/keys/apache.key" - #SSLCertificateKeyFile "@exp_sysconfdir@/server-dsa.key" - #SSLCertificateKeyFile "@exp_sysconfdir@/server-ecc.key" -

1 0

ports/opt (3.1): cups-filters: fix build with poppler 0.34
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit 9283fb301e2335f4f70c91662a46e7271099cf97 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Jul 24 11:49:43 2015 +0200 cups-filters: fix build with poppler 0.34 diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 742fa3f..660483b 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,3 @@ 7540a6989be0042429f41770b1cdf215 cups-browsed f1e11dfe5fa52eb65aa0bdd3a7ee0117 cups-filters-1.0.71.tar.xz +3b5258c23d3ebeb8ea733e5114a947c6 poppler-034.patch diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index f0b0049..3f18350 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -5,13 +5,16 @@ name=cups-filters version=1.0.71 -release=1 +release=2 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz - cups-browsed) + cups-browsed + poppler-034.patch) build () { cd $name-$version + patch -p0 -i $SRC/poppler-034.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \ diff --git a/cups-filters/poppler-034.patch b/cups-filters/poppler-034.patch new file mode 100644 index 0000000..de7ee10 --- /dev/null +++ b/cups-filters/poppler-034.patch @@ -0,0 +1,38 @@ +# http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revisio… + +=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' +--- filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-18 03:17:28 +0000 ++++ filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14 19:22:49 +0000 +@@ -1811,10 +1811,14 @@ + #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, mat); +-#else ++#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 + maskSplash->drawImage(&imageSrc, &imgMaskData, + splashModeMono8, gFalse, maskWidth, maskHeight, + mat,gFalse); ++#else ++ maskSplash->drawImage(&imageSrc, 0, &imgMaskData, ++ splashModeMono8, gFalse, maskWidth, maskHeight, ++ mat,gFalse); + #endif + delete imgMaskData.imgStr; + maskStr->close(); + +=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx' +--- filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000 ++++ filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14 19:22:49 +0000 +@@ -240,8 +240,10 @@ + if (rasterMode) { + #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); +-#else ++#elif POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33 + return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); ++#else ++ return splash->drawImage(src,0,srcData,srcMode,srcAlpha,w,h,mat,gFalse); + #endif + } else { + return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); +

1 0

ports/opt (3.2): thunderbird: readded alsa-lib to deps
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit ad612e794959adc210aaab6fddedea18d6401d4f Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jul 19 11:03:48 2015 +0200 thunderbird: readded alsa-lib to deps diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index 41b31d5..b1fab5b 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -1,7 +1,7 @@ # Description: email client from the Mozilla project # URL: http://www.mozillamessaging.com/en-US/thunderbird/ # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu -# Depends on: python gtk xorg-libxt libidl nss dbus-glib xorg-libxdamage yasm mesa3d libjpeg-turbo +# Depends on: python,gtk,alsa-lib,xorg-libxt,libidl,nss,dbus-glib,xorg-libxdamage,yasm,mesa3d,libjpeg-turbo name=thunderbird version=38.1.0

1 0

ports/opt (3.2): [notify] firefox: enable gstreamer support.
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit c8571eac27d69f31ade21852a60a31ad75f38786 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Mon Jul 20 17:30:32 2015 +0200 [notify] firefox: enable gstreamer support. This port is now prepared for html5 video via the gstreamer framework. Two new ports have been added as dependencies: gstreamer gst-plugins-base For full support you will also need to install gst-plugins-good and gst-libav. These ports can be added at a later date without having to rebuild gstreamer or firefox. See the README for more (the same) info and feel free to contact me with any issues. diff --git a/firefox/.footprint b/firefox/.footprint index f75b60b..faaeb44 100644 --- a/firefox/.footprint +++ b/firefox/.footprint @@ -143,6 +143,10 @@ drwxr-xr-x root/root usr/include/firefox/ -rw-r--r-- root/root usr/include/firefox/GMPVideoHost.h -rw-r--r-- root/root usr/include/firefox/GMPVideoPlaneImpl.h -rw-r--r-- root/root usr/include/firefox/GMPVideoi420FrameImpl.h +-rw-r--r-- root/root usr/include/firefox/GStreamerDecoder.h +-rw-r--r-- root/root usr/include/firefox/GStreamerFormatHelper.h +-rw-r--r-- root/root usr/include/firefox/GStreamerLoader.h +-rw-r--r-- root/root usr/include/firefox/GStreamerReader.h -rw-r--r-- root/root usr/include/firefox/GeckoProfiler.h -rw-r--r-- root/root usr/include/firefox/GeckoProfilerFunc.h -rw-r--r-- root/root usr/include/firefox/GeckoProfilerImpl.h diff --git a/firefox/Pkgfile b/firefox/Pkgfile index bfb1b3d..12a24ea 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -1,11 +1,11 @@ # Description: The Mozilla Firefox browser # URL: http://www.mozilla.com/firefox/ # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu -# Depends on: nss, libidl, gtk, python, alsa-lib, yasm, mesa3d +# Depends on: nss, libidl, gtk, python, alsa-lib, xorg-libxt, yasm, mesa3d, gst-plugins-base name=firefox version=39.0 -release=1 +release=2 source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox… firefox-install-dir.patch firefox.desktop) @@ -31,6 +31,7 @@ cat <<- EOF > .mozconfig ac_add_options --with-pthreads ac_add_options --enable-optimize="$CFLAGS" ac_add_options --enable-official-branding + ac_add_options --with-distribution-id=nu.crux ac_add_options --enable-extensions=default,-gnomevfs ac_add_options --enable-shared ac_add_options --enable-svg @@ -42,7 +43,8 @@ cat <<- EOF > .mozconfig ac_add_options --enable-places_bookmarks ac_add_options --enable-image-encoder=all ac_add_options --enable-xft - ac_add_options --disable-static + ac_add_options --enable-gstreamer=1.0 + ac_add_options --enable-pic ac_add_options --disable-tests ac_add_options --disable-mochitest ac_add_options --disable-dbus @@ -57,9 +59,7 @@ cat <<- EOF > .mozconfig ac_add_options --disable-crashreporter ac_add_options --disable-necko-wifi ac_add_options --disable-libnotify - ac_add_options --disable-gstreamer ac_add_options --disable-pulseaudio - ac_add_options --enable-pic EOF make -f client.mk build diff --git a/firefox/README b/firefox/README new file mode 100644 index 0000000..1863939 --- /dev/null +++ b/firefox/README @@ -0,0 +1,9 @@ +For html5 video and h.264 support you will need to install the additional ports: + +gst-plugins-good +gst-libav + +Depending on what version of firefox in use, you may also need to play around +with the about:config options: + +media.mediasource.*

1 0

ports/opt (3.2): thunderbird: remove double deps
by crux＠crux.nu 24 Jul '15

24 Jul '15

commit 04a4fefb6c60f517269404c44f51b2219faad33e Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Mon Jul 20 17:29:38 2015 +0200 thunderbird: remove double deps diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index 7e4d4ae..901e09c 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -1,7 +1,7 @@ # Description: email client from the Mozilla project # URL: http://www.mozillamessaging.com/en-US/thunderbird/ # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu -# Depends on: python,gtk,alsa-lib,xorg-libxt,libidl,nss,yasm,xorg-libxt,mesa3d,libjpeg-turbo +# Depends on: python,gtk,alsa-lib,xorg-libxt,libidl,nss,yasm,mesa3d,libjpeg-turbo name=thunderbird version=38.1.0

1 0