New commits:
commit 4cb3c27cc79918f996fe544097c702fb5ca37ad1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
wine: Updated devel to 1.5.15
commit b5b2409497a29ef8559c64d310acbd5d352a4b82
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
amsn - change depends libv4l -> v4l-utils
commit b740e83c1a2fe95f284beba2bd736beeee79bbfd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
gegl - change depends libv4l -> v4l-utils
commit cafbda9e588dc6267eead6b74a5cc9a477839dd1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
vips - change depends libv4l -> v4l-utils
commit ae0e2600d6508e4469eb115a4b79c0a5ba95c5d3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
opencv - change depends libv4l -> v4l-utils
commit dd6b23da3006c45e84d566886ec95ea42d5f9bb2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
tellico2 - change depends libv4l -> v4l-utils
commit 3a4c5abf971cd6528829bbb3ca7fe9f9d125108c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kdenetwork4 - change depends libv4l -> v4l-utils
commit c82f7d889574fc871c1b513c5ce5a2b723e35af4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libunicap - change depends libv4l -> v4l-utils
commit b2206dbe69c89211e15953e894b6c9e858854f39
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xine-lib - change depends libv4l -> v4l-utils
commit 4639b9da875f8b7f5d57aea0573bdd4f897ca9d4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
guvcview - change depends libv4l -> v4l-utils
commit 67ba009eeabf17e1e7977c2f7af0e8103cb639d8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kamerka - change depends libv4l -> v4l-utils
commit 83f3e712e8d976b599b25fccb7c70a3401321f54
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
transcode - change depends libv4l -> v4l-utils
commit c62d39fe5a6cf34afb7973aa85d1fde8a6282714
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
vlc - change depends libv4l -> v4l-utils
commit 7b70020424443ad1405c791c51e0da81facc4b15
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
deprecate video-libs/libv4l [replaced by v4l-utils]
commit 27ff107e636b17e624f062a2f54dbbe8cf4d7382
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
v4l-utils: => 0.9.1
commit 49c9ea516c06190a271e82521cdd9b988c77d938
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ruby-1.9: => 1.9.3-p286 (security)
commit e56ade6459b8387fe6c54c5561e7dab715850489
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
poppler 0.20.5
commit 3a71055f5d42fe0a89ff4fbab3c8c8d145de66e5
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
grep 2.14
commit faf03cdff169ddd1765ac1104423efaea967f92a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
Revert "Revert "grep: => 2.12""
This reverts commit 8c6ea96fbce391596ede500b711e3e189e372bef.
The bug sorcery 1.15.1 has problems with grep > 2.10 (Bug #438) is
fiexd.
commit 701368e690da2a8ac29ec2376cf983e785f965ca
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
Revert "Revert "grep 2.11""
This reverts commit 7bf55d385ef6e164122123065cbda9c3e43257a0.
The bug sorcery 1.15.1 has problems with grep > 2.10 (Bug #438) is
fiexd.
commit b7d93f1fdb4267c7c19bc285a7964f56541320be
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
subversion: => 1.7.7
commit fb507e0ecea6923c8aa90fa62089d98dab978e2c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
firefox 16.0.1, SECURITY_PATCH=55
diff --git a/chat-im/amsn/DEPENDS b/chat-im/amsn/DEPENDS
index ca9017e..33818ab 100755
--- a/chat-im/amsn/DEPENDS
+++ b/chat-im/amsn/DEPENDS
@@ -2,7 +2,7 @@ depends tk &&
depends imagemagick &&
depends -sub CXX gcc &&
optional_depends tls "" "" "for secure connection using SSL, for MSNP9" &&
-optional_depends libv4l "" "--disable-libv4l" \
+optional_depends v4l-utils "" "--disable-libv4l" \
"for webcam and audio support via v4l" &&
optional_depends gupnp-igd "" "--disable-upnp" "for UPNP support" &&
optional_depends farsight2 "" "" "for farsight video support, for webcam"
diff --git a/chat-im/amsn/HISTORY b/chat-im/amsn/HISTORY
index fff8e77..784aba2 100644
--- a/chat-im/amsn/HISTORY
+++ b/chat-im/amsn/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PREPARE: Use prepare_select_branch
-
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/collab/subversion/16A0DE01.gpg b/collab/subversion/16A0DE01.gpg
new file mode 100644
index 0000000..4d5b087
Binary files /dev/null and b/collab/subversion/16A0DE01.gpg differ
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index e1fa559..70f961b 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
SPELL=subversion
- VERSION=1.7.5
+ VERSION=1.7.7
SECURITY_PATCH=2
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
@@ -12,7 +12,7 @@ else
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://www.apache.org/dist/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=ED1A599C.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=16A0DE01.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/collab/subversion/ED1A599C.gpg b/collab/subversion/ED1A599C.gpg
deleted file mode 100644
index d26579d..0000000
Binary files a/collab/subversion/ED1A599C.gpg and /dev/null differ
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 1aa9991..0ba5f5f 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,9 @@
+2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.7
+ use 16A0DE01 key
+ * 16A0DE01.gpg: (Ben Reser) added
+ * ED1A599C.gpg: deleted
+
2012-06-26 David C. Haley <khoralin AT gmail.com>
* DEPENDS: zlib optional_depends -> depends
2011-08-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: PATCHLEVEL=1
diff --git a/video-libs/libv4l/BUILD b/video-libs/libv4l/BUILD
index 11df526..27ba77d 100755
--- a/video-libs/libv4l/BUILD
+++ b/video-libs/libv4l/BUILD
@@ -1 +1 @@
-make -C lib all
+true
diff --git a/video-libs/libv4l/CONFLICTS b/video-libs/libv4l/CONFLICTS
new file mode 100755
index 0000000..4e25c94
--- /dev/null
+++ b/video-libs/libv4l/CONFLICTS
@@ -0,0 +1 @@
+conflicts libv4l y
diff --git a/video-libs/libv4l/DETAILS b/video-libs/libv4l/DETAILS
index 5fd0b3d..4fc19b4 100755
--- a/video-libs/libv4l/DETAILS
+++ b/video-libs/libv4l/DETAILS
@@ -1,23 +1,8 @@
SPELL=libv4l
- SPELLX=v4l-utils
- VERSION=0.8.8
-
SOURCE_HASH=sha512:4bc103e8431fa237612fcaa6addd63a03186ade64e306e83384192f0051e6c0f36b22771e66875062a984e1b0e0e255a945afe6dc0d1356560c140293c8d11c4
- SOURCE="${SPELLX}-${VERSION}.tar.bz2"
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
- SOURCE_URL[0]=http://linuxtv.org/downloads/$SPELLX/$SOURCE
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
- WEB_SITE=http://freshmeat.net/projects/libv4l
- LICENSE[0]=LGPL
- ENTERED=20090108
- SHORT="a collection of libraries that adds a thin abstraction
layer on top of video4linux2 (V4L2) devices"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-The purpose of this layer is to make it easy for application writers
-to support a wide variety of devices without having to write separate
-code for different devices in the same class. It consists of 3 different
-libraries. libv4lconvert offers functions to convert from any (known) pixel
-format to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420. libv4l1 offers the
-(deprecated) v4l1 API on top of v4l2 devices, independent of the drivers
-for those devices supporting v4l1 compatibility (which many v4l2 drivers do
-not). libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for
-the application transparent libv4lconvert conversion where necessary.
+deprecated spell [replaced by v4l-utils]
EOF
+
diff --git a/video-libs/libv4l/DOWNLOAD b/video-libs/libv4l/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/video-libs/libv4l/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/video-libs/libv4l/HISTORY b/video-libs/libv4l/HISTORY
index b3e15a7..9f167bc 100644
--- a/video-libs/libv4l/HISTORY
+++ b/video-libs/libv4l/HISTORY
@@ -1,50 +1,4 @@
-2012-05-10 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.8.8
-
-2012-02-22 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.8.6
-
-2011-07-27 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.8.5
-
-2011-06-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.8.4
-
-2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 0.8.3
- Now works with Linux headers 2.6.38+
-
-2011-02-01 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.8.2
-
-2010-09-05 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.8.1, new SOURCE libv4l -> v4l-utils, SOURCE_URL, WEB_SITE
- * BUILD, INSTALL: updated to v4l-utils tarball
-
-2010-01-18 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.6.4
-
-2009-10-26 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.6.3
-
-2009-10-09 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.6.2, new SOURCE_URL[0]
-
-2009-09-01 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.6.1
-
-2009-07-11 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.6.0
-
-2009-06-07 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.5.99
-
-2009-04-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.5.97
-
-2009-03-22 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.5.9
-
-2009-01-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS, BUILD, INSTALL: spell created
-
+2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by v4l-utils]
diff --git a/video-libs/libv4l/INSTALL b/video-libs/libv4l/INSTALL
index 8c2c15c..27ba77d 100755
--- a/video-libs/libv4l/INSTALL
+++ b/video-libs/libv4l/INSTALL
@@ -1 +1 @@
-make -C lib install PREFIX=/usr
+true
diff --git a/video-libs/libv4l/PRE_BUILD b/video-libs/libv4l/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/video-libs/libv4l/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/video-libs/libv4l/UP_TRIGGERS b/video-libs/libv4l/UP_TRIGGERS
new file mode 100755
index 0000000..20c813a
--- /dev/null
+++ b/video-libs/libv4l/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger v4l-utils cast_self
diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index cf58d15..0308c0b 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -188,7 +188,7 @@ optional_depends quicktime-codecs \
# input plugins
if list_find "$XINE_LIB_OPTS" "--enable-v4l2"; then
- optional_depends libv4l \
+ optional_depends v4l-utils \
"--enable-libv4l" \
"--disable-libv4l" \
"for libv4l support"
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 3e8c565..ad69eb7 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,6 +1,8 @@
+2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: libv4l -> v4l-utils
+
2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: replaced libdts with libdca
-
2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.2; switched source to .xz