summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Knoblich <stkn@gentoo.org>2004-09-01 19:55:08 +0000
committerStefan Knoblich <stkn@gentoo.org>2004-09-01 19:55:08 +0000
commit5a9393dc27652f3850177f5b8913628b5dab1865 (patch)
tree3e87cd437862034f86165eb1f167f025857e8728 /dev-libs
parentfix caches irt #62544 (Manifest recommit) (diff)
downloadgentoo-2-5a9393dc27652f3850177f5b8913628b5dab1865.tar.gz
gentoo-2-5a9393dc27652f3850177f5b8913628b5dab1865.tar.bz2
gentoo-2-5a9393dc27652f3850177f5b8913628b5dab1865.zip
finally fixing the patch.. (closing #62192, this time for sure)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/pwlib/ChangeLog5
-rw-r--r--dev-libs/pwlib/files/pwlib-1.6.6-ieee1394dc-fix.diff22
2 files changed, 4 insertions, 23 deletions
diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index 3024adb58a63..8c1b783c1de1 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/pwlib
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.58 2004/08/30 22:59:37 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.59 2004/09/01 19:55:08 stkn Exp $
+
+ 01 Sep 2004; <stkn@gentoo.org> files/pwlib-1.6.6-ieee1394dc-fix.diff:
+ fix the patch one more time...
31 Aug 2004; <stkn@gentoo.org> files/pwlib-1.6.6-ieee1394dc-fix.diff:
cvs killed the patch... (closing #62192)
diff --git a/dev-libs/pwlib/files/pwlib-1.6.6-ieee1394dc-fix.diff b/dev-libs/pwlib/files/pwlib-1.6.6-ieee1394dc-fix.diff
index 4dd2f71e3c96..25c9e10383c5 100644
--- a/dev-libs/pwlib/files/pwlib-1.6.6-ieee1394dc-fix.diff
+++ b/dev-libs/pwlib/files/pwlib-1.6.6-ieee1394dc-fix.diff
@@ -5,28 +5,6 @@ retrieving revision 1.5
diff -u -r1.1 -r1.5
--- openh323/pwlib/plugins/vidinput_dc/video4dc1394.cxx 2003/12/17 15:40:56 1.1
+++ openh323/pwlib/plugins/vidinput_dc/video4dc1394.cxx 2004/06/15 23:55:50 1.5
-@@ -137,6 +137,18 @@
- *
- *
- * $Log: pwlib-1.6.6-ieee1394dc-fix.diff,v $
- * Revision 1.2 2004/08/30 22:57:54 stkn
- * 1/2: fix patch for pwlib (#62192, need to commit with -n...)
- *
-+ * Revision 1.5 2004/06/15 23:55:50 csoutheren
-+ * Added check for different versions of dc1394 API
-+ *
-+ * Revision 1.4 2004/06/15 15:38:29 dsandras
-+ * Fixed bug with latest API of libdc1394.
-+ *
-+ * Revision 1.3 2004/06/14 20:43:33 dsandras
-+ * Try to fix compilation.
-+ *
-+ * Revision 1.2 2004/05/10 10:09:19 csoutheren
-+ * Removed printf that was interpreted as a trigraph
-+ *
- * Revision 1.1 2003/12/17 15:40:56 dominance
- * Added DC Plugin as provided by Julien Puydt <julien.puydt@laposte.net>. Needs manual patching of plugins/configure for now though. (i.e. disabled by default, run autoconf in plugins/)
- *
@@ -413,7 +425,7 @@
else if (supported_framerates & (1U << (31-0)))
framerate = FRAMERATE_1_875;