diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2014-04-14 13:24:34 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2014-04-14 13:24:34 +0800 |
| commit | 25d581d3c494a351d7a9c127d22dc2496d64ea47 (patch) | |
| tree | 76dd1eacd2ded2afd29e1d8e844dda857b6b3863 | |
| parent | 873bcec94ae9c8252965c75fcca799ced9c26e1d (diff) | |
| download | wspkg-25d581d3c494a351d7a9c127d22dc2496d64ea47.tar wspkg-25d581d3c494a351d7a9c127d22dc2496d64ea47.tar.gz wspkg-25d581d3c494a351d7a9c127d22dc2496d64ea47.tar.bz2 wspkg-25d581d3c494a351d7a9c127d22dc2496d64ea47.tar.lz wspkg-25d581d3c494a351d7a9c127d22dc2496d64ea47.tar.xz wspkg-25d581d3c494a351d7a9c127d22dc2496d64ea47.tar.zst wspkg-25d581d3c494a351d7a9c127d22dc2496d64ea47.zip | |
和 217-meta 同步
| -rw-r--r-- | debian.in/debian.pkg | 9 | ||||
| -rw-r--r-- | freebsd.in/freebsd.pkg | 8 | ||||
| -rw-r--r-- | packages.h | 8 |
3 files changed, 17 insertions, 8 deletions
diff --git a/debian.in/debian.pkg b/debian.in/debian.pkg index 4d95d30..7757568 100644 --- a/debian.in/debian.pkg +++ b/debian.in/debian.pkg @@ -122,6 +122,7 @@ #define REMMINA remmina remmina-plugin-gnome remmina-plugin-nx \ remmina-plugin-rdp remmina-plugin-telepathy \ remmina-plugin-vnc remmina-plugin-xdmcp +#define MUTTER libmutter-dev #define GNOME_META_PKG NULL // FIXME: use tasksel? #define BAOBAB baobab #define GLADE glade @@ -161,12 +162,12 @@ #define QT5_DEV NULL // TODO: Add Qt 5 #define PERL_DEV libperl-dev #define MYSQLXX_DEV libmysql++-dev -#define OPENMPI_DEV libopenmpi1.6-dev +#define OPENMPI_DEV libopenmpi-dev #define GFLAGS_DEV libgflags-dev #define BOOST_DEV libboost-all-dev #define IMLIB2_DEV libimlib2-dev #define EXOSIP2_DEV libexosip2-dev -#define OPENCV_DEV libcv-dev libcvaux-dev libhighgui-dev +#define OPENCV_DEV libopencv-dev #define FFMPEG_DEV libavcodec-dev libavformat-dev libpostproc-dev \ libavutil-dev libswscale-dev libavfilter-dev #define SDL_DEV libsdl1.2-dev libsdl2-dev \ @@ -185,6 +186,7 @@ // Math #define GSL gsl-bin #define OCTAVE_DEV liboctave-dev +#define QHULL libqhull-dev #define R_BASE r-base // Misc @@ -270,7 +272,7 @@ // Ruby #define RUBY ruby ruby-dev -#define RUBY_MYSQL libmysql-ruby +#define RUBY_MYSQL ruby-mysql // Science #define BLAST2 blast2 @@ -329,6 +331,7 @@ // Video #define MPLAYER mplayer2 gnome-mplayer +#define X264 libx264-dev // Web #define FLASH_PLUGIN flashplugin-nonfree swfdec-mozilla diff --git a/freebsd.in/freebsd.pkg b/freebsd.in/freebsd.pkg index 84e0d91..bb37a2a 100644 --- a/freebsd.in/freebsd.pkg +++ b/freebsd.in/freebsd.pkg @@ -66,8 +66,8 @@ #define OPENJDK6 openjdk6 #define OPENJDK7 openjdk #define SUBVERSION subversion svk psvn-emacs24 -#define TCL tcl84 -#define TK tk84 +#define TCL tcl84 tcl85 tcl86 +#define TK tk84 tk85 tk86 #define ECLIPSE eclipse eclipse-cdt eclipse-langpack eclipse-pydev #define JIKES jikes #define BIOJAVA biojava @@ -114,6 +114,7 @@ #define GTK2_ENGINES gtk-engines2 #define GVFS gvfs #define REMMINA remmina remmina-plugins +#define MUTTER // XXX: Not available - need GNOME 3 import #define GNOME_META_PKG gnome2-lite // XXX: GNOME 3 may be imported recently #define BAOBAB gnome-utils #define GLADE glade3 @@ -159,6 +160,7 @@ #define OPENCV_DEV opencv #define FFMPEG_DEV ffmpeg ffmpeg0 #define SDL_DEV sdl sdl2 sdl_mixer sdl2_mixer +#define POPPLER_DEV poppler // Lisp // Lua @@ -173,6 +175,7 @@ // Math #define GSL gsl #define OCTAVE_DEV octave +#define QHULL qhull5 #define R_BASE R // Misc @@ -318,6 +321,7 @@ // Video #define MPLAYER mplayer mplayer-fonts gnome-mplayer \ mencoder mplayer2 +#define X264 x264 // Web #define FLASH_PLUGIN swfdec-plugin nspluginwrapper linux_base-f10 \ @@ -141,7 +141,7 @@ TERMINUS URWFONTS NONFREE_FONTS KCFONTS FIREFLYTTF alacarte evince file-roller gcalctool GDM gnome-backgrounds gnome-keyring gnome-nettool gnome-screensaver gnome-themes GNOME_USER_DOCS GTK2_ENGINES GVFS REMMINA -seahorse xdg-user-dirs zenity +seahorse xdg-user-dirs zenity MUTTER // freebsd local-217 GNOME_META_PKG // added by b01902062@linux5.csie.ntu.edu.tw @@ -185,6 +185,7 @@ EXOSIP2_DEV // voip OPENCV_DEV // opencv suite FFMPEG_DEV // ffmpeg suite SDL_DEV +POPPLER_DEV #endif // Lisp @@ -213,7 +214,8 @@ VM // requested by cj // Math #ifdef WSPKG_MATH -GSL gnuplot octave OCTAVE_DEV R_BASE +GSL gnuplot octave OCTAVE_DEV QHULL +R_BASE #endif // Misc @@ -330,7 +332,7 @@ upx // Video #ifdef WSPKG_VIDEO -MPLAYER xmms2 gxmms2 +MPLAYER xmms2 gxmms2 X264 #endif // Web |