[arch-commits] Commit in wxcam/repos (6 files)
Balló György
bgyorgy at archlinux.org
Mon Jul 3 05:59:41 UTC 2017
Date: Monday, July 3, 2017 @ 05:59:41
Author: bgyorgy
Revision: 242101
archrelease: copy trunk to community-i686, community-x86_64
Added:
wxcam/repos/community-i686/PKGBUILD
(from rev 242100, wxcam/trunk/PKGBUILD)
wxcam/repos/community-i686/gtk3-fix.patch
(from rev 242100, wxcam/trunk/gtk3-fix.patch)
wxcam/repos/community-x86_64/PKGBUILD
(from rev 242100, wxcam/trunk/PKGBUILD)
wxcam/repos/community-x86_64/gtk3-fix.patch
(from rev 242100, wxcam/trunk/gtk3-fix.patch)
Deleted:
wxcam/repos/community-i686/PKGBUILD
wxcam/repos/community-x86_64/PKGBUILD
---------------------------------+
/PKGBUILD | 68 ++++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 24 -------------
community-i686/gtk3-fix.patch | 39 +++++++++++++++++++++
community-x86_64/PKGBUILD | 24 -------------
community-x86_64/gtk3-fix.patch | 39 +++++++++++++++++++++
5 files changed, 146 insertions(+), 48 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-07-03 05:59:35 UTC (rev 242100)
+++ community-i686/PKGBUILD 2017-07-03 05:59:41 UTC (rev 242101)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgname=wxcam
-pkgver=1.1
-pkgrel=9
-arch=('i686' 'x86_64')
-license=(GPL)
-pkgdesc="Webcam application for linux"
-url="http://wxcam.sourceforge.net"
-makedepends=('intltool>=0.35.0' 'libsm')
-depends=('libglade' 'mjpegtools' 'perl-xml-parser' 'wxgtk' 'xvidcore' 'v4l-utils' 'alsa-lib' 'cimg')
-source=(wxcam.tar.gz::"http://wxcam.cvs.sourceforge.net/viewvc/wxcam/wxcam/?view=tar")
-md5sums=('SKIP')
-
-build() {
- cd "$srcdir"/$pkgname
- sed -i "s/^DEFAULTCONF.*$/DEFAULTCONF=Release/g" nbproject/Makefile-impl.mk
- make
-}
-
-package() {
- cd "$srcdir"/$pkgname
- install -Dm755 bin/wxcam "$pkgdir"/usr/bin/wxcam
-}
Copied: wxcam/repos/community-i686/PKGBUILD (from rev 242100, wxcam/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-07-03 05:59:41 UTC (rev 242101)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgname=wxcam
+pkgver=1.1
+pkgrel=10
+arch=('i686' 'x86_64')
+license=(GPL)
+pkgdesc="Webcam application for linux"
+url="http://wxcam.sourceforge.net"
+depends=('mjpegtools' 'wxgtk3' 'xvidcore' 'v4l-utils' 'alsa-lib' 'cimg' 'ffmpeg')
+source=(wxcam.tar.gz::"http://wxcam.cvs.sourceforge.net/viewvc/wxcam/wxcam/?view=tar"
+ gtk3-fix.patch)
+md5sums=('SKIP'
+ 'e48a79b8e444e719672336b40d09f275')
+
+prepare() {
+ cd "$srcdir"/$pkgname
+
+ # Build with wxgtk3
+ patch -Np1 -i ../gtk3-fix.patch
+ sed -i "s/wx-config /wx-config-gtk3 /" nbproject/*
+
+ sed -i "s/^DEFAULTCONF.*$/DEFAULTCONF=Release/g" nbproject/Makefile-impl.mk
+}
+
+build() {
+ cd "$srcdir"/$pkgname
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname
+ install -Dm755 bin/wxcam "$pkgdir"/usr/bin/wxcam
+}
Copied: wxcam/repos/community-i686/gtk3-fix.patch (from rev 242100, wxcam/trunk/gtk3-fix.patch)
===================================================================
--- community-i686/gtk3-fix.patch (rev 0)
+++ community-i686/gtk3-fix.patch 2017-07-03 05:59:41 UTC (rev 242101)
@@ -0,0 +1,39 @@
+diff -Naur wxcam.orig/include/wxcam.h wxcam/include/wxcam.h
+--- wxcam.orig/include/wxcam.h 2010-05-23 16:00:56.000000000 +0200
++++ wxcam/include/wxcam.h 2017-07-03 07:25:23.521791275 +0200
+@@ -51,7 +51,6 @@
+ void OnSettingVideoStd( wxCommandEvent& event );
+ void OnRecording( wxCommandEvent& event );
+ void OnTakeSnapshot( wxCommandEvent& event );
+- void OnPaintBackground( wxPaintEvent& event );
+ void OnResize( wxSizeEvent& event );
+ void enableRec(bool enable);
+ void setRecordingTime(const wxTimeSpan &ts);
+diff -Naur wxcam.orig/src/wxcam.cpp wxcam/src/wxcam.cpp
+--- wxcam.orig/src/wxcam.cpp 2016-12-07 12:11:12.000000000 +0100
++++ wxcam/src/wxcam.cpp 2017-07-03 07:25:36.508822088 +0200
+@@ -86,7 +86,6 @@
+ EVT_MENU( DateTime_Filter, wxCam::OnSettingDateTime )
+ EVT_MENU( Menu_MovementDetection, wxCam::OnMovementDetection )
+ EVT_MENU( Menu_ShowMDAreas, wxCam::OnShowMDAreas )
+-EVT_PAINT( wxCam::OnPaintBackground )
+ EVT_SIZE( wxCam::OnResize )
+ END_EVENT_TABLE()
+
+@@ -286,16 +285,6 @@
+ frame->SetSize( GetClientSize() );
+ }
+
+-void wxCam::OnPaintBackground( wxPaintEvent& event )
+-{
+- int w, h;
+- wxPaintDC dc( panel );
+- dc.GetSize( &w, &h );
+- dc.SetBrush( wxBrush( *wxWHITE ) );
+- dc.SetPen( wxPen( *wxWHITE, 1, wxSOLID ) );
+- dc.DrawRectangle( 0, 0, w, h );
+-}
+-
+ void wxCam::OnQuit( wxCommandEvent& WXUNUSED( event ) )
+ {
+ Close( TRUE );
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-07-03 05:59:35 UTC (rev 242100)
+++ community-x86_64/PKGBUILD 2017-07-03 05:59:41 UTC (rev 242101)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgname=wxcam
-pkgver=1.1
-pkgrel=9
-arch=('i686' 'x86_64')
-license=(GPL)
-pkgdesc="Webcam application for linux"
-url="http://wxcam.sourceforge.net"
-makedepends=('intltool>=0.35.0' 'libsm')
-depends=('libglade' 'mjpegtools' 'perl-xml-parser' 'wxgtk' 'xvidcore' 'v4l-utils' 'alsa-lib' 'cimg')
-source=(wxcam.tar.gz::"http://wxcam.cvs.sourceforge.net/viewvc/wxcam/wxcam/?view=tar")
-md5sums=('SKIP')
-
-build() {
- cd "$srcdir"/$pkgname
- sed -i "s/^DEFAULTCONF.*$/DEFAULTCONF=Release/g" nbproject/Makefile-impl.mk
- make
-}
-
-package() {
- cd "$srcdir"/$pkgname
- install -Dm755 bin/wxcam "$pkgdir"/usr/bin/wxcam
-}
Copied: wxcam/repos/community-x86_64/PKGBUILD (from rev 242100, wxcam/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-07-03 05:59:41 UTC (rev 242101)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgname=wxcam
+pkgver=1.1
+pkgrel=10
+arch=('i686' 'x86_64')
+license=(GPL)
+pkgdesc="Webcam application for linux"
+url="http://wxcam.sourceforge.net"
+depends=('mjpegtools' 'wxgtk3' 'xvidcore' 'v4l-utils' 'alsa-lib' 'cimg' 'ffmpeg')
+source=(wxcam.tar.gz::"http://wxcam.cvs.sourceforge.net/viewvc/wxcam/wxcam/?view=tar"
+ gtk3-fix.patch)
+md5sums=('SKIP'
+ 'e48a79b8e444e719672336b40d09f275')
+
+prepare() {
+ cd "$srcdir"/$pkgname
+
+ # Build with wxgtk3
+ patch -Np1 -i ../gtk3-fix.patch
+ sed -i "s/wx-config /wx-config-gtk3 /" nbproject/*
+
+ sed -i "s/^DEFAULTCONF.*$/DEFAULTCONF=Release/g" nbproject/Makefile-impl.mk
+}
+
+build() {
+ cd "$srcdir"/$pkgname
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname
+ install -Dm755 bin/wxcam "$pkgdir"/usr/bin/wxcam
+}
Copied: wxcam/repos/community-x86_64/gtk3-fix.patch (from rev 242100, wxcam/trunk/gtk3-fix.patch)
===================================================================
--- community-x86_64/gtk3-fix.patch (rev 0)
+++ community-x86_64/gtk3-fix.patch 2017-07-03 05:59:41 UTC (rev 242101)
@@ -0,0 +1,39 @@
+diff -Naur wxcam.orig/include/wxcam.h wxcam/include/wxcam.h
+--- wxcam.orig/include/wxcam.h 2010-05-23 16:00:56.000000000 +0200
++++ wxcam/include/wxcam.h 2017-07-03 07:25:23.521791275 +0200
+@@ -51,7 +51,6 @@
+ void OnSettingVideoStd( wxCommandEvent& event );
+ void OnRecording( wxCommandEvent& event );
+ void OnTakeSnapshot( wxCommandEvent& event );
+- void OnPaintBackground( wxPaintEvent& event );
+ void OnResize( wxSizeEvent& event );
+ void enableRec(bool enable);
+ void setRecordingTime(const wxTimeSpan &ts);
+diff -Naur wxcam.orig/src/wxcam.cpp wxcam/src/wxcam.cpp
+--- wxcam.orig/src/wxcam.cpp 2016-12-07 12:11:12.000000000 +0100
++++ wxcam/src/wxcam.cpp 2017-07-03 07:25:36.508822088 +0200
+@@ -86,7 +86,6 @@
+ EVT_MENU( DateTime_Filter, wxCam::OnSettingDateTime )
+ EVT_MENU( Menu_MovementDetection, wxCam::OnMovementDetection )
+ EVT_MENU( Menu_ShowMDAreas, wxCam::OnShowMDAreas )
+-EVT_PAINT( wxCam::OnPaintBackground )
+ EVT_SIZE( wxCam::OnResize )
+ END_EVENT_TABLE()
+
+@@ -286,16 +285,6 @@
+ frame->SetSize( GetClientSize() );
+ }
+
+-void wxCam::OnPaintBackground( wxPaintEvent& event )
+-{
+- int w, h;
+- wxPaintDC dc( panel );
+- dc.GetSize( &w, &h );
+- dc.SetBrush( wxBrush( *wxWHITE ) );
+- dc.SetPen( wxPen( *wxWHITE, 1, wxSOLID ) );
+- dc.DrawRectangle( 0, 0, w, h );
+-}
+-
+ void wxCam::OnQuit( wxCommandEvent& WXUNUSED( event ) )
+ {
+ Close( TRUE );
More information about the arch-commits
mailing list