* dc1394 cosmetics (forward-porting [18096])

diff --git a/configure.ac b/configure.ac
index f0ed8c92b194e25b8ec081cb3a8fa034bc7858a1..e6c84769f3d3653e26b2082aa4338d7f51d3adf0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1671,19 +1671,19 @@ dnl         AC_CHECK_LIB( dc1394_control, dc1394_setup_capture, [
               VLC_ADD_LDFLAGS([dc1394],[-ldc1394_control -lraw1394])
 dnl         ],
 dnl         [
-dnl           AC_MSG_ERROR([libdc1394 are mandatory for dc1394 input module. try --disable-dc1394 or install those libraries])
+dnl           AC_MSG_ERROR([libdc1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library])
 dnl         ])
       ],
       [
-        AC_MSG_ERROR([libdc1394 are mandatory for dc1394 input module. try --disable-dc1394 or install those libraries])
+        AC_MSG_ERROR([libdc1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library])
       ])
     ],
     [
-      AC_MSG_ERROR([libraw1394 are mandatory for dc1394 input module. try --disable-dc1394 or install those libraries])
+      AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library])
     ])
   ],
   [
-    AC_MSG_ERROR([libraw1394 is mandatory for dc1394 input module. try --disable-dc1394 or install those libraries])
+    AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library])
   ])
 fi
 

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index a1834f7d2c1c9c46f37c95cf776b536aa11ec979..9d8a1fe87c259baba45740e52c3611a6ff210921 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -100,10 +100,10 @@ GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
 LIBCACA_VERSION=0.9
 LIBCACA_URL=http://libcaca.zoy.org/files/libcaca-$(LIBCACA_VERSION).tar.gz
 LIBDC1394_VERSION=1.2.1
-LIBDC1394_URL=http://surfnet.dl.sourceforge.net/sourceforge/libdc1394/libdc1394-$(LIBDC1394_VERSION).tar.gz
+LIBDC1394_URL=$(SF)/libdc1394/libdc1394-$(LIBDC1394_VERSION).tar.gz
 LIBDC1394_SVN=https://svn.sourceforge.net/svnroot
 LIBRAW1394_VERSION=1.2.0
-LIBRAW1394_URL=http://surfnet.dl.sourceforge.net/sourceforge/libraw1394/libraw1394-$(LIBRAW1394_VERSION).tar.gz
+LIBRAW1394_URL=$(SF)/libraw1394/libraw1394-$(LIBRAW1394_VERSION).tar.gz
 LIBRAW1394_SVN=https://svn.sourceforge.net/svnroot
 LIBDTS_VERSION=0.0.2
 LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz