Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (436b0f4bf4af82457ffcca33e958f7e516139dde)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (436b0f4bf4af82457ffcca33e958f7e516139dde)
  • Date: Thu, 12 May 2011 20:48:26 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

chat-libs/libmsn/HISTORY | 4
chat-libs/libmsn/PRE_BUILD | 7 +
http/webkitgtk/DEPENDS | 9 --
http/webkitgtk/HISTORY | 3
libs/glibc/DETAILS | 2
libs/glibc/HISTORY | 3
net/pump/DETAILS | 4
net/pump/HISTORY | 6 +
smgl/simpleinit-msb/HISTORY | 5 +
smgl/simpleinit-msb/PRE_BUILD | 2
smgl/simpleinit-msb/simpleinit-ftbfs-define-enoictlcmd.patch | 13 +++
telephony/telepathy-farsight/DETAILS | 2
telephony/telepathy-farsight/HISTORY | 3
telephony/telepathy-glib/DETAILS | 2
telephony/telepathy-glib/HISTORY | 3
telephony/telepathy-logger/DETAILS | 2
telephony/telepathy-logger/HISTORY | 3
utils/hal/HISTORY | 5 +
utils/hal/PRE_BUILD | 3
utils/hal/linux-2.6.38-v4l.patch | 45
+++++++++++
video-libs/libv4l/DETAILS | 5 -
video-libs/libv4l/HISTORY | 4
video-libs/libv4l/v4l-utils-0.8.3.tar.bz2.sig |binary
23 files changed, 109 insertions(+), 26 deletions(-)

New commits:
commit 436b0f4bf4af82457ffcca33e958f7e516139dde
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "telepathy-logger 0.2.8"

This reverts commit f603cf7c1d1a4bf5dfc737bf5966ad223f2b35ab.

Breaks empathy, see Bug #15978.

Successfully test cast after these reverts:
papyon telepathy-farsight sofia-sip
telepathy-python telepathy-haze telepathy-sofiasip
telepathy-butterfly telepathy-logger telepathy-stream-engine
telepathy-glib telepathy-salut empathy

commit 0ea4465d9643e701e6f91767ef295e2519358a12
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "telepathy-farsight 0.0.17"

This reverts commit dc4154f5f439f414224e482f879c13fd9d9904f5.

Breaks empathy, see Bug #15978.

commit ff8e484c000a6f4f9457132143389624e9345c6f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "telepathy-glib 0.14.3"

This reverts commit 6eaa6e532d13c257b05d183eb3bf87cdadd2ef3c.

Breaks empathy, see Bug #15978

commit f8d9b3228c2b94e02974930c4558103cc651aa99
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "telepathy-glib: 0.13.x requires vala 0.11.3+ (devel)"

This reverts commit a6b8424c88daa4bdc613bd92d52f55cd012bd271.

Undoing this as reverting telepathy 0.14.x updates

commit a6b8424c88daa4bdc613bd92d52f55cd012bd271
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

telepathy-glib: 0.13.x requires vala 0.11.3+ (devel)

$ gaze version vala telepathy-glib
Grimoire Section Spell Grimoire Version Installed Version
-------- ------- ----- ---------------- -----------------
test devel vala 0.10.4 0.10.4
test telephony telepathy-glib 0.14.3 0.12.6

Making all in vala
make[2]: Entering directory `/usr/src/telepathy-glib-0.14.3/vala'
/usr/bin/vapigen \
--library telepathy-glib \
--pkg gio-2.0 \
../telepathy-glib/TelepathyGLib-0.12.gir \

error: The type name `GLib.TypeInterface' could not be found
Generation failed: 1 error(s), 0 warning(s)
make[2]: *** [telepathy-glib.vapi] Error 1
make[2]: Leaving directory `/usr/src/telepathy-glib-0.14.3/vala'
make[1]: Leaving directory `/usr/src/telepathy-glib-0.14.3'
make[1]: *** [all-recursive] Error 1

commit 69f4a2491f1199fa37726da7f423839fbeb0b84f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libmsn: Print patch application message

commit 5fe1396e1b01c7fc04b9b18ec082a6ef73a4eeaa
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

webkitgtk: Cleanup formatting in DEPENDS

commit a04fff7da227d45d4ac59ef34d025e4e08078a02
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

webkitgtk: stable is now at 1.4.0 which requires devel libsoup

$ # gaze version webkitgtk libsoup
Grimoire Section Spell Grimoire Version Installed Version
-------- ------- ----- ---------------- -----------------
test http webkitgtk 1.4.0 1.2.7
test gnome2-libs libsoup 2.32.2 2.32.2

checking for LIBSOUP... configure: error: Package requirements
(libsoup-2.4 >= 2.33.6) were not met:

Requested 'libsoup-2.4 >= 2.33.6' but version of libsoup is 2.32.2

Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.

Alternatively, you may set the environment variables LIBSOUP_CFLAGS
and LIBSOUP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.

commit 00c47b6edf37fa8aafe658c02d9594bbaa42edb9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

pump: pump_0.8.24-7.diff.gz changed
See http://osdir.com/ml/debian-devel-changes/2010-02/msg02881.html for a
list of changes.
pump_0.8.24-7.diff.gz matches upstream posted SHA256
(See http://ftp.debian.org/debian/pool/main/p/pump/pump_0.8.24-7.dsc)
PATCHLEVEL++ to rebuild with updated diff

commit 6d089828581f856c9c46b63ffc00cc1dea39593d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libmsn: Only apply openssl-1.0.0.patch when using OpenSSL 1.0.0+

with openssl 0.9.8r:
Scanning dependencies of target msntest
[100%] Building CXX object msntest/CMakeFiles/msntest.dir/msntest.cpp.o
/usr/src/libmsn-4.1/msntest/msntest.cpp: In function 'int main()':
/usr/src/libmsn-4.1/msntest/msntest.cpp:265: error: invalid conversion
from 'const SSL_METHOD*' to 'SSL_METHOD*'
/usr/src/libmsn-4.1/msntest/msntest.cpp:265: error: initializing
argument 1 of 'SSL_CTX* SSL_CTX_new(SSL_METHOD*)'
make[2]: *** [msntest/CMakeFiles/msntest.dir/msntest.cpp.o] Error 1
make[1]: *** [msntest/CMakeFiles/msntest.dir/all] Error 2

commit 0d82d958d1550464a7bf42a402fb458f88b3d6fb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libv4l: Updated to 0.8.3
Now works with Linux headers 2.6.38+

commit e3d9d7a4e733afd4ffbc6cc135079d96ee9e628d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

simpleinit-msb: Define ENOIOCTLCMD for Linux headers 2.6.38+

commit 2d0979298f05e5a24cd981cbb81347c5ed81d955
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

hal: Fix compilation with linux 2.6.38+ headers
See https://bugs.launchpad.net/ubuntu/+source/hal/+bug/721399

commit 4c08af9cd98d3ed781b28d22dd4e47d5b7549607
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

glibc: Updated default kernel headers to 2.6.38

diff --git a/chat-libs/libmsn/HISTORY b/chat-libs/libmsn/HISTORY
index e455d2d..816cf05 100644
--- a/chat-libs/libmsn/HISTORY
+++ b/chat-libs/libmsn/HISTORY
@@ -1,3 +1,7 @@
+2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Only apply openssl-1.0.0.patch for openssl 1.0.0+
+ Print patch application message
+
2011-01-13 Julien "_kaze_" ROZO <julien AT rozo.org>
* PRE_BUILD, openssl-1.0.0.patch: added a patch to fix compilation
issue with openssl version 1.0.0
diff --git a/chat-libs/libmsn/PRE_BUILD b/chat-libs/libmsn/PRE_BUILD
index 48c0686..1aad80f 100755
--- a/chat-libs/libmsn/PRE_BUILD
+++ b/chat-libs/libmsn/PRE_BUILD
@@ -1,3 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
+
+# Only apply with OpenSSL 1.0.0+
+if [[ "$(installed_version openssl|sed 's:[a-z]::g'|sed 's:\.::g'|sed
's:^0::')" -ge "100" ]]; then
+ message "${MESSAGE_COLOR}Applying OpenSSL 1.0.0+ patch...${DEFAULT_COLOR}"
&&
+ patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
+fi
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 509a35c..1859011 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -10,15 +10,8 @@ depends JPEG &&
depends bison &&
depends flex &&
depends sqlite &&
-
-if [ "$WEBKITGTK_NIGHT" = 'y' ]; then
- depends -sub SOUP_DEVEL libsoup
-else
- depends libsoup
-fi &&
-
+depends -sub SOUP_DEVEL libsoup
depends enchant &&
-
depends libxt &&

optional_depends cairo '--enable-svg' \
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index cc96612..fe17269 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: stable is now at 1.4.0, which requires devel libsoup
+
2011-04-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.0

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 1d6a1b3..1aed58f 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -45,7 +45,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
PATCHLEVEL=0
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- HEADERS_VERSION=2.6.37
+ HEADERS_VERSION=2.6.38
SOURCE3=linux-${HEADERS_VERSION}.tar.bz2
SOURCE6=${SOURCE3}.sign
SOURCE6_IGNORE=signature
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 8a72bd1..5965ca4 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2011-05-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated default kernel headers to 2.6.38
+
2011-02-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.13, HEADERS_VERSION=2.6.37
* PRE_BUILD, test-installation.pl.patch: added patch
diff --git a/net/pump/DETAILS b/net/pump/DETAILS
index 63385f4..50d8f25 100755
--- a/net/pump/DETAILS
+++ b/net/pump/DETAILS
@@ -1,12 +1,12 @@
SPELL=pump
VERSION=0.8.24
DEB_PL=7
- PATCHLEVEL=6
+ PATCHLEVEL=7
SOURCE="${SPELL}_${VERSION}.orig.tar.gz"

SOURCE_HASH=sha512:b6956f0ab2a5fbcda2320efd454d21aee651816a13a55622e21dc3a29919aef7db7c9a8d71c3b37b1969f29cff37c67d313f763a17404652fb962bc54eabcb34
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/p/${SPELL}/${SOURCE}
SOURCE2="${SPELL}_${VERSION}-${DEB_PL}.diff.gz"
-
SOURCE2_HASH=sha512:7b6af9857949ee398f371cd0552fad96bdaa6ad99cf2f83103236658f92d8a9aeca498639b3bac279f24cc7298bbaed71c1c465b5648ca99034b091484f8024b
+
SOURCE2_HASH=sha512:8d70bb31f9d56d79b4cb74def6d3df2a3115b62672190d8c38b7fa628ad35481ad637dd4854e8331a4c5a649fa573c58c9b867b014bbaad7fe6c8c870a02eae2
SOURCE2_URL[0]=http://ftp.debian.org/debian/pool/main/p/${SPELL}/${SOURCE2}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://ftp.debian.org/debian/pool/main/p/pump/";
diff --git a/net/pump/HISTORY b/net/pump/HISTORY
index f112b7a..cf05aea 100644
--- a/net/pump/HISTORY
+++ b/net/pump/HISTORY
@@ -1,3 +1,9 @@
+2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: pump_0.8.24-7.diff.gz changed
+ See http://osdir.com/ml/debian-devel-changes/2010-02/msg02881.html
+ pump_0.8.24-7.diff.gz matches upstream posted SHA256
+ PATCHLEVEL++ to rebuild with updated diff
+
2010-04-08 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: DEB_PL=7, PATCHLEVEL++

diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index a02adea..4caf329 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,8 @@
+2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply simpleinit-ftbfs-define-enoictlcmd.patch
+ * simpleinit-ftbfs-define-enoictlcmd.patch: Define ENOIOCTLCMD for
+ Linux headers 2.6.38+
+
2010-12-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: changed source url to our mirror and updated website

diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD
index aef793c..0855fbe 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -7,6 +7,8 @@ patch -p0 < "$SPELL_DIRECTORY/simpleinit-msb-crypt.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-output-on-shutdown.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-selinux.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-nonls.patch" &&
+message "${MESSAGE_COLOR}Apply linux 2.6.38+ headers
patch...${DEFAULT_COLOR}" &&
+patch -p1 < "$SPELL_DIRECTORY/simpleinit-ftbfs-define-enoictlcmd.patch" &&

if [[ $SIMPLEINIT_STATIC == y ]]; then
sedit 's#shutdown: shutdown.o $(LIB)/my_reboot.o
$(LIB)/xstrncpy.o#shutdown: shutdown.o $(LIB)/my_reboot.o
$(LIB)/xstrncpy.o\n\t$(CC) $(LDFLAGS) -o $@ $^#' login-utils/Makefile &&
diff --git a/smgl/simpleinit-msb/simpleinit-ftbfs-define-enoictlcmd.patch
b/smgl/simpleinit-msb/simpleinit-ftbfs-define-enoictlcmd.patch
new file mode 100644
index 0000000..31f95bf
--- /dev/null
+++ b/smgl/simpleinit-msb/simpleinit-ftbfs-define-enoictlcmd.patch
@@ -0,0 +1,13 @@
+diff -Naur simpleinit-msb-1.3.orig/sysvtools/bootlogd.c
simpleinit-msb-1.3/sysvtools/bootlogd.c
+--- simpleinit-msb-1.3.orig/sysvtools/bootlogd.c 2011-05-12
15:20:38.263708528 -0700
++++ simpleinit-msb-1.3/sysvtools/bootlogd.c 2011-05-12 15:22:44.089708477
-0700
+@@ -228,6 +228,9 @@
+ }
+
+ #ifdef TIOCGDEV
++ #ifndef ENOIOCTLCMD
++ #define ENOIOCTLCMD 515
++ #endif
+ if (ioctl(0, TIOCGDEV, &kdev) == 0)
+ return findtty(res, rlen, (dev_t)kdev);
+ if (errno != ENOIOCTLCMD) return -1;
diff --git a/telephony/telepathy-farsight/DETAILS
b/telephony/telepathy-farsight/DETAILS
index 9d3fdb0..117a176 100755
--- a/telephony/telepathy-farsight/DETAILS
+++ b/telephony/telepathy-farsight/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-farsight
- VERSION=0.0.17
+ VERSION=0.0.14
WEB_SITE=http://telepathy.freedesktop.org
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
diff --git a/telephony/telepathy-farsight/HISTORY
b/telephony/telepathy-farsight/HISTORY
index f4ec53e..fafdfcc 100644
--- a/telephony/telepathy-farsight/HISTORY
+++ b/telephony/telepathy-farsight/HISTORY
@@ -1,6 +1,3 @@
-2011-04-14 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.0.17
-
2010-07-15 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 0.0.14

diff --git a/telephony/telepathy-glib/DETAILS
b/telephony/telepathy-glib/DETAILS
index aa852be..dbd8a1a 100755
--- a/telephony/telepathy-glib/DETAILS
+++ b/telephony/telepathy-glib/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-glib
- VERSION=0.14.3
+ VERSION=0.12.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-glib/HISTORY
b/telephony/telepathy-glib/HISTORY
index 5bb06cd..9b6fccd 100644
--- a/telephony/telepathy-glib/HISTORY
+++ b/telephony/telepathy-glib/HISTORY
@@ -1,6 +1,3 @@
-2011-04-12 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.14.3
-
2011-03-10 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on vala built with vapigen (Bug #15950)

diff --git a/telephony/telepathy-logger/DETAILS
b/telephony/telepathy-logger/DETAILS
index ae236a2..c749816 100755
--- a/telephony/telepathy-logger/DETAILS
+++ b/telephony/telepathy-logger/DETAILS
@@ -1,5 +1,5 @@
SPELL=telepathy-logger
- VERSION=0.2.8
+ VERSION=0.1.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
WEB_SITE=http://telepathy.freedesktop.org
diff --git a/telephony/telepathy-logger/HISTORY
b/telephony/telepathy-logger/HISTORY
index 5dd3d0d..4953a69 100644
--- a/telephony/telepathy-logger/HISTORY
+++ b/telephony/telepathy-logger/HISTORY
@@ -1,6 +1,3 @@
-2011-04-14 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 0.2.8
-
2011-01-23 George Sherwood <gsherwood AT sourcemage.org>
* DEPENDS: depends telepathy-glib

diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 4b8867f..aedd101 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,8 @@
+2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply linux-2.6.38-v4l.patch
+ * linux-2.6.38-v4l.patch: Fix compilation with linux 2.6.38+ headers
+ See https://bugs.launchpad.net/ubuntu/+source/hal/+bug/721399
+
2011-01-09 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: removed libcap as a required dep

diff --git a/utils/hal/PRE_BUILD b/utils/hal/PRE_BUILD
index 0a2ed38..bf0c4dc 100755
--- a/utils/hal/PRE_BUILD
+++ b/utils/hal/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+message "${MESSAGE_COLOR}Apply Linux 2.6.38+ headers
patch...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/linux-2.6.38-v4l.patch &&
+
if [[ $HAL_VER == devel ]]; then
NOCONFIGURE=1 ./autogen.sh
fi
diff --git a/utils/hal/linux-2.6.38-v4l.patch
b/utils/hal/linux-2.6.38-v4l.patch
new file mode 100644
index 0000000..077f73a
--- /dev/null
+++ b/utils/hal/linux-2.6.38-v4l.patch
@@ -0,0 +1,45 @@
+# From
http://cgit.freedesktop.org/hal/commit/?id=ae13d96fa2a0612b6000f4b8f6ed9d3564035703
+# to better fix https://bugs.launchpad.net/ubuntu/+source/hal/+bug/721399
+diff --git a/hald/linux/probing/probe-video4linux.c
b/hald/linux/probing/probe-video4linux.c
+index 7bc13e8..b055720 100644
+--- a/hald/linux/probing/probe-video4linux.c
++++ b/hald/linux/probing/probe-video4linux.c
+@@ -30,7 +30,9 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
++#ifdef HAVE_LINUX_VIDEODEV_H
+ #include <linux/videodev.h>
++#endif
+ #include <linux/videodev2.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -50,7 +52,9 @@ main (int argc, char *argv[])
+ int ret = -1;
+ char *udi;
+ char *device_file;
++#ifdef HAVE_LINUX_VIDEODEV_H
+ struct video_capability v1cap;
++#endif
+ struct v4l2_capability v2cap;
+ LibHalContext *ctx = NULL;
+ LibHalChangeSet *cset;
+@@ -107,7 +111,9 @@ main (int argc, char *argv[])
+ LIBHAL_FREE_DBUS_ERROR (&error);
+ libhal_device_add_capability (ctx, udi,
"video4linux.radio", &error);
+ }
+- } else {
++ }
++#ifdef HAVE_LINUX_VIDEODEV_H
++ else {
+ HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed"));
+
+ if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
+@@ -134,6 +140,7 @@ main (int argc, char *argv[])
+ HAL_DEBUG (("ioctl VIDIOCGCAP failed"));
+ }
+ }
++#endif
+
+ LIBHAL_FREE_DBUS_ERROR (&error);
+ libhal_device_commit_changeset (ctx, cset, &error);
diff --git a/video-libs/libv4l/DETAILS b/video-libs/libv4l/DETAILS
index 4382438..0fc25eb 100755
--- a/video-libs/libv4l/DETAILS
+++ b/video-libs/libv4l/DETAILS
@@ -1,8 +1,9 @@
SPELL=libv4l
SPELLX=v4l-utils
- VERSION=0.8.2
-
SOURCE_HASH=sha512:f89f33c525a0f9afbd1da44bf45a9b455abd411de50ab8267a9953fc87263189b5917fffe4340f26372665e3370411b0ef149ae766aceb7577de53c6c0ba7b5f
+ VERSION=0.8.3
+#
SOURCE_HASH=sha512:f89f33c525a0f9afbd1da44bf45a9b455abd411de50ab8267a9953fc87263189b5917fffe4340f26372665e3370411b0ef149ae766aceb7577de53c6c0ba7b5f
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
diff --git a/video-libs/libv4l/HISTORY b/video-libs/libv4l/HISTORY
index be2dc74..4616266 100644
--- a/video-libs/libv4l/HISTORY
+++ b/video-libs/libv4l/HISTORY
@@ -1,3 +1,7 @@
+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

diff --git a/video-libs/libv4l/v4l-utils-0.8.3.tar.bz2.sig
b/video-libs/libv4l/v4l-utils-0.8.3.tar.bz2.sig
new file mode 100644
index 0000000..1475b4d
Binary files /dev/null and b/video-libs/libv4l/v4l-utils-0.8.3.tar.bz2.sig
differ



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (436b0f4bf4af82457ffcca33e958f7e516139dde), Eric Sandall, 05/12/2011

Archive powered by MHonArc 2.6.24.

Top of Page