Changeset caf200f5e94783c777e0a859e92bddc6608a01c0

Timestamp:

12/08/02 17:16:19 (6 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1039364179 +0000

git-parent:

[892b62c4ee2d1e73c0fffd7bc8f9209a851fcb9a]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1039364179 +0000

Message:

- Updated Maintainers file
- fixed --disable-dvd, it did not work
- updated iPaq familiar buildscripts

Files:

• MAINTAINERS (modified) (3 diffs)
• configure.ac.in (modified) (8 diffs)
• ipkg/rules (modified) (2 diffs)
• ipkg/rules.gpe (modified) (1 diff)
• ipkg/rules.opie (modified) (3 diffs)

MAINTAINERS

@@ -1 @@
-4 2002/12/04 02:16:23 titer
+5 2002/12/08 16:16:19 jpsaman
-#
-#                            VLC MAINTAINERS
@@ -41 +41 @@
-  - modules qt, kde : [sigmund]
-  - module xosd : [lool]
+  - module familar : [saman]
-
-* VIDEO OUTPUT
@@ -49 +50 @@
-  - modules x11, xvideo : [gibalou]
-  - module aa : [sigmund]
+  - module qte : [saman]
-
-* AUDIO OUTPUT

configure.ac.in

@@ -49 +49 @@
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
+AC_CHECK_TOOL(AR, ar, :)
+AC_CHECK_TOOL(LD, ld, :)
-
-dnl
@@ -875 +877 @@
-AC_ARG_ENABLE(dvd,
-[  --enable-dvd            DVD input module (default enabled)])
-
+ -a "x${enable_dvd}" != "x"
-then
-  AC_ARG_WITH(dvdcss,
@@ -1775 +1777 @@
-  then
-    PLUGINS="${PLUGINS} vout_sdl aout_sdl"
-
+ | sed 's,SDL,,'
-    LDFLAGS_vout_sdl="${LDFLAGS_vout_sdl} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
-
+ | sed 's,SDL,,'
-    LDFLAGS_aout_sdl="${LDFLAGS_aout_sdl} `${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`"
-    CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_vout_sdl}"
@@ -1807 +1809 @@
-AC_ARG_ENABLE(qte,
-  [  --enable-qte            QT Embedded support (default disabled)])
-!= "xno
+= "xyes
-then
-  AC_ARG_WITH(qte,
-
-
-
-test="-L${QTDIR}/lib
-PPFLAGS_test="-I${QTDIR}/include
+   
+!= "xno" -a "x${with_qte}" !
+
+qte="${LDFLAGS_qte} -L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte
+FLAGS_qte="${CFLAGS_qte} -I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti
-  else
-test="-L${with_qte}/lib
-PPFLAGS_test="-I${with_qte}/include
-
-
-PPFLAGS_test
-
-  CPPFLAGS_qte="${CPPFLAGS_qte} ${CPPFLAGS_test} -DQT_QWS_IPAQ -DQWS"
-
-LDFLAGS_qte="${LDFLAGS_qte} ${LDFLAGS_test} -lqte"
-  if test "x${with_qte}" = "x"
-  then
-    PLUGINS="${PLUGINS} qte"
-
-      BUILTINS="${BUILTINS} 
-
-])
+qte="${LDFLAGS_qte} -L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte
+FLAGS_qte="${CFLAGS_qte} -I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti
+
+
+FLAGS_qte
+
+AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
+
+AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
+] )
+if test "x${ac_cv_qte_headers}" = "xyes"
+then
+
+#    LDFLAGS_qte="${LDFLAGS_qte} -ljpeg -l
+
+fi
-  CPPFLAGS="${CPPFLAGS_save}"
-fi
@@ -2131 +2133 @@
-    AC_PATH_PROG(GTK_CONFIG, gtk-config, no, ${GTK_PATH})
-  fi
+  # check for cross-compiling
+  GTK_PREFIX=
+  AC_ARG_WITH(gtk-prefix,
+    [    --with-gtk-prefix=PATH path to libgtk (needed for cross-compiling),
+                          e.g use as:
+                          --with-gtk-prefix=/usr/local/arm/2.95.3/arm-linux/usr)],[],[])
+  if test "x$with_gtk_prefix" != "xno" -a "x$with_gtk_prefix" != "x"
+  then
+    GTK_PREFIX="--prefix=$with_gtk_prefix"
+  fi
-  if test "x${GTK_CONFIG}" != "xno"
-  then
@@ -2137 +2149 @@
-      AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-familiar.])
-    fi
-
-
+${GTK_PREFIX} 
+${GTK_PREFIX} 
-    # now look for the gtk.h header
-    CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_familiar}"
@@ -2146 +2158 @@
-      echo "Cannot find gtk development headers."
-    ])
+
+    # now look for gpe support
+    AC_ARG_WITH(gpe-prefix,
+    [    --with-gpe-prefix=PATH gpe installation path prefix (default search in \$PATH)],[],[])
+    if test "x$with_gpe_prefix" != "xno"  -a "x$with_gpe_prefix" != "x"
+    then
+      CFLAGS_gpe="-I$with_gpe_prefix/include"
+      LDFLAGS_gpe="-lXi -lgdk_pixbuf -L$with_gpe_prefix/lib -lgpewidget"
+      # now look for gpe/init.h header file
+      CFLAGS_save=$CFLAGS
+      LDFLAGS_save=$LDFLAGS
+      CFLAGS="${CFLAGS_familiar} ${CFLAGS_gpe}"
+      LDFLAGS="${LDFLAGS_familiar} ${LDFLAGS_gpe}"
+      CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_familiar} ${CFLAGS_gpe}"
+      ac_cv_gpe_headers=yes
+      AC_CHECK_HEADERS(gpe/init.h, ,
+        [ ac_cv_gpe_headers=no
+          AC_MSG_ERROR([Cannot find development headers for libgpewidget...]) ])
+#      AC_CHECK_LIB(gpewidget, gpe_application_init,
+#        [ LDFLAGS_gpe="${LDFLAGS_gpe} -lgpewidget" ],
+#        [ AC_MSG_ERROR([Cannot find libgpewidget library...]) ])
+      CFLAGS=$CFLAGS_save
+      LDFLAGS=$LDFLAG_save
+      if test "x${ac_cv_gpe_headers}" = "xyes"
+      then
+        CFLAGS_familiar="${CFLAGS_familiar} ${CFLAGS_gpe}"
+        LDFLAGS_familiar="${LDFLAGS_familiar} ${LDFLAGS_gpe}"
+      fi
+    fi
-    if test "x${ac_cv_gtk_headers}" = "xyes"
-    then
@@ -2266 +2307 @@
-  [if test "x${enable_opie}" = "xyes"; then
-     AC_ARG_WITH(qte,
-
-
+   
+!= "xno" -a "x${with_qte}" !
-     then
-QTDIR}/lib
-PPFLAGS_test="-I${QTDIR}/include
+with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`
+FLAGS_test="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`
-     else
-with_qte}/lib
-PPFLAGS_test="-I${with_qte}/include
+QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`
+FLAGS_test="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`
-     fi
+     CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_test}"
+     ac_cv_qte_headers=yes
+     AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
+       ac_cv_qte_headers=no
+       AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
+     ] )
+     if test "x${ac_cv_qte_headers}" = "xyes"
+     then
+       CFLAGS_qte="${CFLAGS_qte} ${CFLAGS_test} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti"
+       LDFLAGS_qte="${LDFLAGS_qte} ${LDFLAGS_test} -ljpeg -lqte"
+     fi
+     CPPFLAGS="${CPPFLAGS_save}"
-
-     PLUGINS="${PLUGINS} opie"
-${LDFLAGS_test} -lqte
-test
+-lqpe ${LDFLAGS_qte}
+qte
-     if test -x ${QTEDIR}/bin/moc
-     then

ipkg/rules

@@ -12 +12 @@
-export PIXDIR="usr/share/pixmaps"
-export DESTDIR=/tmp/vlc
+export DESTDIR=/usr/local/arm/2.95.3/arm-linux
+export PKGDIR=/home/jpsaman/iPaq/packages/vlc-0.5.0
-
-build: build-stamp
@@ -32 +34 @@
-
-install: build
-DEST
+PKG
-    $(STRIP) vlc
-
+
+
+
+
+
-
-.PHONY: build clean install

ipkg/rules.gpe

@@ -83 +83 @@
-    cp vlc $(PKGDIR)/usr/bin
-    cp ipkg/vlc.gpe ${PKGDIR}/usr/lib/menu/vlc
-
+
+
+
+
-
-.PHONY: build clean install

ipkg/rules.opie

@@ -32 +32 @@
-    --with-tuning=strongarm1100 \
-    --with-mad-tree=/home/jpsaman/iPaq/src/mad-0.14.2b \
+    --with-sdl-config-path=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop/bin \
+    --with-sdl-prefix=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop \
-    --with-qte=/usr/local/arm/2.95.3/arm-linux/opt/QtPalmtop \
-    --with-ffmpeg-tree=/home/jpsaman/iPaq/src/ffmpeg"
@@ -52 +54 @@
-build-stamp:
-# This is ugly -- I know
- 
+
-
-    $(MAKE)
-
-    touch build-stamp
-
-clean:
-    rm -f build-stamp
-
-    -$(MAKE) distclean
@@ -80 +79 @@
-    cp ipkg/vlc.opie ${PKGDIR}/opt/QtPalmtop/bin/opie-vlc
-    cp ipkg/vlc.desktop ${PKGDIR}/opt/QtPalmtop/apps/Applications
-
+
+
+
+
-
-.PHONY: build clean install