[arch-commits] Commit in amsn/repos (10 files)

Bartłomiej Piotrowski bpiotrowski at nymeria.archlinux.org
Tue Apr 30 08:25:43 UTC 2013 

    Date: Tuesday, April 30, 2013 @ 10:25:43
  Author: bpiotrowski
Revision: 89587

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  amsn/repos/community-staging-i686/
  amsn/repos/community-staging-i686/PKGBUILD
    (from rev 89586, amsn/trunk/PKGBUILD)
  amsn/repos/community-staging-i686/amsn-0.98.9-no-rebuild-on-install.patch
    (from rev 89586, amsn/trunk/amsn-0.98.9-no-rebuild-on-install.patch)
  amsn/repos/community-staging-i686/amsn-0.98.9-v4l2.patch
    (from rev 89586, amsn/trunk/amsn-0.98.9-v4l2.patch)
  amsn/repos/community-staging-i686/amsn.changelog
    (from rev 89586, amsn/trunk/amsn.changelog)
  amsn/repos/community-staging-x86_64/
  amsn/repos/community-staging-x86_64/PKGBUILD
    (from rev 89586, amsn/trunk/PKGBUILD)
  amsn/repos/community-staging-x86_64/amsn-0.98.9-no-rebuild-on-install.patch
    (from rev 89586, amsn/trunk/amsn-0.98.9-no-rebuild-on-install.patch)
  amsn/repos/community-staging-x86_64/amsn-0.98.9-v4l2.patch
    (from rev 89586, amsn/trunk/amsn-0.98.9-v4l2.patch)
  amsn/repos/community-staging-x86_64/amsn.changelog
    (from rev 89586, amsn/trunk/amsn.changelog)

------------------------------------------------------------------+
 community-staging-i686/PKGBUILD                                  |   46 ++++++++++
 community-staging-i686/amsn-0.98.9-no-rebuild-on-install.patch   |   14 +++
 community-staging-i686/amsn-0.98.9-v4l2.patch                    |   44 +++++++++
 community-staging-i686/amsn.changelog                            |   11 ++
 community-staging-x86_64/PKGBUILD                                |   46 ++++++++++
 community-staging-x86_64/amsn-0.98.9-no-rebuild-on-install.patch |   14 +++
 community-staging-x86_64/amsn-0.98.9-v4l2.patch                  |   44 +++++++++
 community-staging-x86_64/amsn.changelog                          |   11 ++
 8 files changed, 230 insertions(+)

Copied: amsn/repos/community-staging-i686/PKGBUILD (from rev 89586, amsn/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2013-04-30 08:25:43 UTC (rev 89587)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Jeff Mickey <j at codemac.net>
+
+pkgname=amsn
+pkgver=0.98.9
+pkgrel=3
+pkgdesc="MSN client written in Tcl/Tk"
+arch=('i686' 'x86_64')
+url="http://amsn.sourceforge.net/"
+license=('GPL2')
+depends=('tk' 'tls')
+makedepends=('libjpeg' 'libpng' 'farstream' 'libv4l')
+# not compatible with farstream 0.2
+#optdepends=('farstream: for video conferencing')
+changelog=$pkgname.changelog
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.bz2
+        $pkgname-$pkgver-v4l2.patch
+        $pkgname-$pkgver-no-rebuild-on-install.patch)
+sha256sums=('1fd2620489cc3627a841773a79cf28a7c9c438979c76d37f231a773a79e7f23e'
+            '5371339024548fad3b3c5330e3bc410360a383a75d1771fb656885acddfc44cf'
+            'dd560bebcfa672ba0be56b70dbcaa069b0faba7206d9cb8ea5d61fbd50ad81a1')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  # patch for linux kernel header changes
+  patch -Np0 -i ${srcdir}/$pkgname-$pkgver-v4l2.patch
+  # build patch
+  patch -Np0 -i ${srcdir}/$pkgname-$pkgver-no-rebuild-on-install.patch
+
+  # python2 fix
+  for file in lang/missing.py plugins/music/infosongbird; do
+      sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file}
+  done
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  make DESTDIR=${pkgdir} install
+}

Copied: amsn/repos/community-staging-i686/amsn-0.98.9-no-rebuild-on-install.patch (from rev 89586, amsn/trunk/amsn-0.98.9-no-rebuild-on-install.patch)
===================================================================
--- community-staging-i686/amsn-0.98.9-no-rebuild-on-install.patch	                        (rev 0)
+++ community-staging-i686/amsn-0.98.9-no-rebuild-on-install.patch	2013-04-30 08:25:43 UTC (rev 89587)
@@ -0,0 +1,14 @@
+--- Makefile.in	2012-05-18 21:28:05.000000000 +0200
++++ Makefile.in	2012-06-02 12:26:35.585073960 +0200
+@@ -261,3 +261,5 @@
+ 
+-install_libs:: rebuild_libs do_install_libs
++install_libs:: clean_libs
++	$(MAKE) rebuild_libs
++	$(MAKE) do_install_libs
+ 
+@@ -278,3 +280,3 @@
+ rebuild_libs: LIBDIR=$(libdir)/$(PACKAGE)
+-rebuild_libs: clean_libs $(LIBS_WITH_RPATH)
++rebuild_libs: $(LIBS_WITH_RPATH)
+ 

Copied: amsn/repos/community-staging-i686/amsn-0.98.9-v4l2.patch (from rev 89586, amsn/trunk/amsn-0.98.9-v4l2.patch)
===================================================================
--- community-staging-i686/amsn-0.98.9-v4l2.patch	                        (rev 0)
+++ community-staging-i686/amsn-0.98.9-v4l2.patch	2013-04-30 08:25:43 UTC (rev 89587)
@@ -0,0 +1,44 @@
+--- configure.ac	2012-05-23 21:21:14.000000000 +0200
++++ configure.ac	2012-06-02 12:29:24.836921683 +0200
+@@ -378,6 +378,10 @@
+ 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
+ fi
+ 
++if test "$FOUND_OS" = "linux"; then
++    AC_CHECK_HEADERS(linux/videodev2.h)
++fi
++
+ #---------------------------------------------------------------------------------------------
+ 
+ dnl ---------------------------------------------------------------------
+--- utils/linux/capture/capture.h	2011-04-12 02:20:59.000000000 +0200
++++ utils/linux/capture/capture.h	2012-06-02 12:29:24.836921683 +0200
+@@ -34,7 +34,11 @@
+ #ifdef HAVE_SYS_VIDEODEV2_H
+ #   include <sys/videodev2.h>
+ #else
+-#   include <linux/videodev.h>
++	#ifdef HAVE_LINUX_VIDEODEV2_H
++		#include <linux/videodev2.h>
++	#else
++		#include <linux/videodev.h>
++	#endif
+ #endif
+ */
+ 
+--- utils/linux/capture/libng/plugins/Rules.mk	2012-05-18 17:31:32.000000000 +0200
++++ utils/linux/capture/libng/plugins/Rules.mk	2012-06-02 12:51:59.523065502 +0200
+@@ -2,6 +2,13 @@
+ TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so
+ TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS})
+ 
++plugin_link_so         = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@
++ifeq ($(verbose),no)
++  echo_plugin_link_so          = echo "  LDP    " $@
++else
++  echo_plugin_link_so          = echo $(plugin_link_so)
++endif
++  
+ # global targets
+ all:: $(TARGETS-plugins)
+ 
\ No newline at end of file

Copied: amsn/repos/community-staging-i686/amsn.changelog (from rev 89586, amsn/trunk/amsn.changelog)
===================================================================
--- community-staging-i686/amsn.changelog	                        (rev 0)
+++ community-staging-i686/amsn.changelog	2013-04-30 08:25:43 UTC (rev 89587)
@@ -0,0 +1,11 @@
+2012-06-02 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* amsn 0.98.9-1
+
+2010-12-13 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* Update to major release 0.98.4
+
+2010-03-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* Update to major release 0.98.3
+
+2009-07-26  Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* FS#15542 fixed in 0.97.2-14

Copied: amsn/repos/community-staging-x86_64/PKGBUILD (from rev 89586, amsn/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2013-04-30 08:25:43 UTC (rev 89587)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Jeff Mickey <j at codemac.net>
+
+pkgname=amsn
+pkgver=0.98.9
+pkgrel=3
+pkgdesc="MSN client written in Tcl/Tk"
+arch=('i686' 'x86_64')
+url="http://amsn.sourceforge.net/"
+license=('GPL2')
+depends=('tk' 'tls')
+makedepends=('libjpeg' 'libpng' 'farstream' 'libv4l')
+# not compatible with farstream 0.2
+#optdepends=('farstream: for video conferencing')
+changelog=$pkgname.changelog
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.bz2
+        $pkgname-$pkgver-v4l2.patch
+        $pkgname-$pkgver-no-rebuild-on-install.patch)
+sha256sums=('1fd2620489cc3627a841773a79cf28a7c9c438979c76d37f231a773a79e7f23e'
+            '5371339024548fad3b3c5330e3bc410360a383a75d1771fb656885acddfc44cf'
+            'dd560bebcfa672ba0be56b70dbcaa069b0faba7206d9cb8ea5d61fbd50ad81a1')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  # patch for linux kernel header changes
+  patch -Np0 -i ${srcdir}/$pkgname-$pkgver-v4l2.patch
+  # build patch
+  patch -Np0 -i ${srcdir}/$pkgname-$pkgver-no-rebuild-on-install.patch
+
+  # python2 fix
+  for file in lang/missing.py plugins/music/infosongbird; do
+      sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file}
+  done
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  make DESTDIR=${pkgdir} install
+}

Copied: amsn/repos/community-staging-x86_64/amsn-0.98.9-no-rebuild-on-install.patch (from rev 89586, amsn/trunk/amsn-0.98.9-no-rebuild-on-install.patch)
===================================================================
--- community-staging-x86_64/amsn-0.98.9-no-rebuild-on-install.patch	                        (rev 0)
+++ community-staging-x86_64/amsn-0.98.9-no-rebuild-on-install.patch	2013-04-30 08:25:43 UTC (rev 89587)
@@ -0,0 +1,14 @@
+--- Makefile.in	2012-05-18 21:28:05.000000000 +0200
++++ Makefile.in	2012-06-02 12:26:35.585073960 +0200
+@@ -261,3 +261,5 @@
+ 
+-install_libs:: rebuild_libs do_install_libs
++install_libs:: clean_libs
++	$(MAKE) rebuild_libs
++	$(MAKE) do_install_libs
+ 
+@@ -278,3 +280,3 @@
+ rebuild_libs: LIBDIR=$(libdir)/$(PACKAGE)
+-rebuild_libs: clean_libs $(LIBS_WITH_RPATH)
++rebuild_libs: $(LIBS_WITH_RPATH)
+ 

Copied: amsn/repos/community-staging-x86_64/amsn-0.98.9-v4l2.patch (from rev 89586, amsn/trunk/amsn-0.98.9-v4l2.patch)
===================================================================
--- community-staging-x86_64/amsn-0.98.9-v4l2.patch	                        (rev 0)
+++ community-staging-x86_64/amsn-0.98.9-v4l2.patch	2013-04-30 08:25:43 UTC (rev 89587)
@@ -0,0 +1,44 @@
+--- configure.ac	2012-05-23 21:21:14.000000000 +0200
++++ configure.ac	2012-06-02 12:29:24.836921683 +0200
+@@ -378,6 +378,10 @@
+ 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
+ fi
+ 
++if test "$FOUND_OS" = "linux"; then
++    AC_CHECK_HEADERS(linux/videodev2.h)
++fi
++
+ #---------------------------------------------------------------------------------------------
+ 
+ dnl ---------------------------------------------------------------------
+--- utils/linux/capture/capture.h	2011-04-12 02:20:59.000000000 +0200
++++ utils/linux/capture/capture.h	2012-06-02 12:29:24.836921683 +0200
+@@ -34,7 +34,11 @@
+ #ifdef HAVE_SYS_VIDEODEV2_H
+ #   include <sys/videodev2.h>
+ #else
+-#   include <linux/videodev.h>
++	#ifdef HAVE_LINUX_VIDEODEV2_H
++		#include <linux/videodev2.h>
++	#else
++		#include <linux/videodev.h>
++	#endif
+ #endif
+ */
+ 
+--- utils/linux/capture/libng/plugins/Rules.mk	2012-05-18 17:31:32.000000000 +0200
++++ utils/linux/capture/libng/plugins/Rules.mk	2012-06-02 12:51:59.523065502 +0200
+@@ -2,6 +2,13 @@
+ TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so
+ TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS})
+ 
++plugin_link_so         = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@
++ifeq ($(verbose),no)
++  echo_plugin_link_so          = echo "  LDP    " $@
++else
++  echo_plugin_link_so          = echo $(plugin_link_so)
++endif
++  
+ # global targets
+ all:: $(TARGETS-plugins)
+ 
\ No newline at end of file

Copied: amsn/repos/community-staging-x86_64/amsn.changelog (from rev 89586, amsn/trunk/amsn.changelog)
===================================================================
--- community-staging-x86_64/amsn.changelog	                        (rev 0)
+++ community-staging-x86_64/amsn.changelog	2013-04-30 08:25:43 UTC (rev 89587)
@@ -0,0 +1,11 @@
+2012-06-02 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* amsn 0.98.9-1
+
+2010-12-13 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* Update to major release 0.98.4
+
+2010-03-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* Update to major release 0.98.3
+
+2009-07-26  Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* FS#15542 fixed in 0.97.2-14

More information about the arch-commits mailing list