diff options
| -rw-r--r-- | multimedia/ogmrip/Makefile | 107 | ||||
| -rw-r--r-- | multimedia/ogmrip/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/ogmrip/files/patch-amd64 | 58 | ||||
| -rw-r--r-- | multimedia/ogmrip/files/patch-fix_audio_overhead | 24 | ||||
| -rw-r--r-- | multimedia/ogmrip/pkg-plist | 105 |
5 files changed, 137 insertions, 163 deletions
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile index 0d1711c92d5d..5f62ff731c99 100644 --- a/multimedia/ogmrip/Makefile +++ b/multimedia/ogmrip/Makefile @@ -6,8 +6,7 @@ # PORTNAME= ogmrip -DISTVERSION= 0.10.0-rc4 -PORTREVISION= 1 +DISTVERSION= 0.10.2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,56 +18,106 @@ BUILD_DEPENDS= mencoder:${PORTSDIR}/multimedia/mplayer \ oggenc:${PORTSDIR}/audio/vorbis-tools \ ogmmerge:${PORTSDIR}/multimedia/ogmtools \ lame:${PORTSDIR}/audio/lame \ - gocr:${PORTSDIR}/graphics/gocr \ gsed:${PORTSDIR}/textproc/gsed RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mplayer \ oggenc:${PORTSDIR}/audio/vorbis-tools \ ogmmerge:${PORTSDIR}/multimedia/ogmtools \ - lame:${PORTSDIR}/audio/lame \ - gocr:${PORTSDIR}/graphics/gocr -LIB_DEPENDS= xvidcore:${PORTSDIR}/multimedia/xvid \ - dvdread:${PORTSDIR}/multimedia/libdvdread \ - theora:${PORTSDIR}/multimedia/libtheora \ - enchant:${PORTSDIR}/textproc/enchant - -BROKEN= Incomplete pkg-plist -DEPRECATED= Broken and no maintainer -EXPIRATION_DATE=2007-03-21 + lame:${PORTSDIR}/audio/lame +LIB_DEPENDS= dvdread:${PORTSDIR}/multimedia/libdvdread USE_LDCONFIG= yes USE_GETTEXT= yes -USE_GNOME= gnomehack gnomeprefix gtk20 glib20 gconf2 libglade2 intlhack +USE_GNOME= glib20 libxml2 gnomehack GNU_CONFIGURE= yes USE_XLIB= yes USE_GMAKE= yes -GCONF_SCHEMAS= ogmrip.schemas +USE_GSED= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" CONFIGURE_ARGS= --sharedstatedir=${PREFIX}/libdata GMAKE_ENV+= GMSGFMT=${localbase}/bin/msgfmt +OPTIONS= GUI "Build the GTK+ GUI" on \ + HAL "Enable Hardware Abstract Layer (HAL) support" off \ + FAAC "Enable Advance Audio Coding (AAC) support" off \ + SRT "Enable SRT text subtitles support" off \ + ENCHANT "Enable spell checking for text subtitles" off \ + THEORA "Enable Ogg Theora video codec support" off \ + MATROSKA "Enable Matroska container support" off \ + DEBUG "Enable debug" off + +.include <bsd.port.pre.mk> + .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-maintainer-mode --enable-devel-mode .endif -.include <bsd.port.pre.mk> +.if defined(WITHOUT_GUI) +CONFIGURE_ARGS+= --disable-gtk-support +PLIST_SUB+= GUI_SUPPORT="@comment " +.else +CONFIGURE_ARGS+= --enable-gtk-support +PLIST_SUB+= GUI_SUPPORT="" +USE_GNOME+= libglade2 gconf2 intlhack +GCONF_SCHEMAS= ogmrip.schemas +.endif + +.if defined(WITH_HAL) +CONFIGURE_ARGS+= --enable-hal-support +LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal +PLIST_SUB+= HAL_SUPPORT="" +.else +CONFIGURE_ARGS+= --disable-hal-support +PLIST_SUB+= HAL_SUPPORT="@comment " +.endif + +.if defined(WITH_MATROSKA) +CONFIGURE_ARGS+= --enable-matroska-support +BUILD_DEPENDS+= mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix +RUN_DEPENDS+= mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix +PLIST_SUB+= MATROSKA_SUPPORT="" +.else +CONFIGURE_ARGS+= --disable-matroska-support +PLIST_SUB+= MATROSKA_SUPPORT="@comment " +.endif + +.if defined(WITH_FAAC) +CONFIGURE_ARGS+= --enable-aac-support +BUILD_DEPENDS+= faac:${PORTSDIR}/audio/faac +RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac +PLIST_SUB+= FAAC_SUPPORT="" +.else +CONFIGURE_ARGS+= --disable-aac-support +PLIST_SUB+= FAAC_SUPPORT="@comment " +.endif -.if exists(${LOCALBASE}/bin/mkvmerge) -BUILD_DEPENDS+= mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix -RUN_DEPENDS+= mkvmerge:${PORTSDIR}/multimedia/mkvtoolnix -PLIST_SUB+= MKV_SUPPORT="" +.if defined(WITH_SRT) +CONFIGURE_ARGS+= --enable-srt-support +BUILD_DEPENDS+= gocr:${PORTSDIR}/graphics/gocr +RUN_DEPENDS+= gocr:${PORTSDIR}/graphics/gocr +PLIST_SUB+= SRT_SUPPORT="" .else -PLIST_SUB+= MKV_SUPPORT="@comment " +CONFIGURE_ARGS+= --disable-srt-support +PLIST_SUB+= SRT_SUPPORT="@comment " .endif -X264_SUPPORT!= ${LOCALBASE}/bin/mencoder -ovc help 2> /dev/null | ${GREP} -q '^ *x264 *- .*$$' \ - && ${ECHO_CMD} "" || ${ECHO_CMD} "@comment " -PLIST_SUB+= X264_SUPPORT="${X264_SUPPORT}" +.if defined(WITH_THEORA) +CONFIGURE_ARGS+= --enable-theora-support +LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora +PLIST_SUB+= THEORA_SUPPORT="" +.else +CONFIGURE_ARGS+= --disable-theora-support +PLIST_SUB+= THEORA_SUPPORT="@comment " +.endif -.if !defined(WITH_DEBUG) -pre-extract: - @${ECHO_MSG} "" - @${ECHO_MSG} " *** Define WITH_DEBUG to enable debug symbols ***" - @${ECHO_MSG} "" +.if defined(WITH_ENCHANT) +CONFIGURE_ARGS+= --enable-enchant-support +LIB_DEPENDS+= enchant:${PORTSDIR}/textproc/enchant +PLIST_SUB+= ENCHANT_SUPPORT="" +.else +CONFIGURE_ARGS+= --disable-enchant-support +PLIST_SUB+= ENCHANT_SUPPORT="@comment " .endif pre-configure: diff --git a/multimedia/ogmrip/distinfo b/multimedia/ogmrip/distinfo index 689eb37061cd..11b99bfe040e 100644 --- a/multimedia/ogmrip/distinfo +++ b/multimedia/ogmrip/distinfo @@ -1,3 +1,3 @@ -MD5 (ogmrip-0.10.0-rc4.tar.gz) = d0d78301644e996b40d782702d413d7a -SHA256 (ogmrip-0.10.0-rc4.tar.gz) = 4bc6b04a59463a1c8fd99ed42aead4600b1b9c05f785c3e9afcd9b64e948ed17 -SIZE (ogmrip-0.10.0-rc4.tar.gz) = 622444 +MD5 (ogmrip-0.10.2.tar.gz) = cffcff0746e745605d30e7978ad0deb5 +SHA256 (ogmrip-0.10.2.tar.gz) = 3e0d0c39bedff4ab9b9a48f687f1bce91fa19a36a6ba11d6f509d4765dcb4da3 +SIZE (ogmrip-0.10.2.tar.gz) = 627638 diff --git a/multimedia/ogmrip/files/patch-amd64 b/multimedia/ogmrip/files/patch-amd64 deleted file mode 100644 index 811e3ccd2a22..000000000000 --- a/multimedia/ogmrip/files/patch-amd64 +++ /dev/null @@ -1,58 +0,0 @@ -* Fix compilation on amd64 -* Fix compilation with mplayer < 1.0pre8 - -Index: libogmrip/ogmrip-backend.c -=================================================================== ---- libogmrip/ogmrip-backend.c (révision 843) -+++ libogmrip/ogmrip-backend.c (copie de travail) -@@ -406,8 +406,7 @@ - gdouble - ogmrip_backend_dvdcpy_watch (OGMJobExec *exec, const gchar *buffer, OGMRipVideo *video) - { -- size_t bytes, total; -- guint percent; -+ guint bytes, total, percent; - - if (sscanf (buffer, "%u/%u blocks written (%u%%)", &bytes, &total, &percent) == 3) - return percent / 100.; -@@ -1378,8 +1377,12 @@ - GPtrArray *argv; - - const gchar *device; -- gint vid, sstep; -+ gint vid; - -+#if MPLAYER_PRE >= 8 -+ gint sstep; -+#endif -+ - g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL); - - title = ogmrip_codec_get_input (OGMRIP_CODEC (video)); -Index: dvdcpy/dvdcpy.c -=================================================================== ---- dvdcpy/dvdcpy.c (révision 843) -+++ dvdcpy/dvdcpy.c (copie de travail) -@@ -286,11 +286,11 @@ - } - - current_size += count; -- fprintf (stdout, "\r%d/%d blocks written (%d%%)", current_size, total_size, current_size * 100 / total_size); -+ fprintf (stdout, "\r%zd/%zd blocks written (%zd%%)", current_size, total_size, current_size * 100 / total_size); - fflush (stdout); - } - -- fprintf (stdout, "\r%d/%d blocks written (%d%%)", current_size, total_size, current_size * 100 / total_size); -+ fprintf (stdout, "\r%zd/%zd blocks written (%zd%%)", current_size, total_size, current_size * 100 / total_size); - fflush (stdout); - - return size; -@@ -801,7 +801,7 @@ - - if (total_size > get_space_left (output)) - { -- fprintf (stderr, "Error: Not enough space left on device (%d bytes needed)\n", total_size); -+ fprintf (stderr, "Error: Not enough space left on device (%zd bytes needed)\n", total_size); - ifoClose (vmg_file); - DVDClose (reader); - return EXIT_FAILURE; diff --git a/multimedia/ogmrip/files/patch-fix_audio_overhead b/multimedia/ogmrip/files/patch-fix_audio_overhead deleted file mode 100644 index e19e0eef3915..000000000000 --- a/multimedia/ogmrip/files/patch-fix_audio_overhead +++ /dev/null @@ -1,24 +0,0 @@ -Fix audio overhead - -Index: libogmrip/ogmrip-container.c -=================================================================== ---- libogmrip/ogmrip-container.c (révision 843) -+++ libogmrip/ogmrip-container.c (copie de travail) -@@ -563,12 +563,15 @@ - ogmrip_container_get_audio_overhead (OGMRipContainer *container, OGMRipContainerChild *child) - { - glong length; -- gint samples_per_frame, bitrate = 0; -+ gint samples_per_frame, sample_rate; -+ guint numerator, denominator; - - length = ogmrip_codec_get_length (child->codec, NULL); -+ sample_rate = ogmrip_audio_get_sample_rate (OGMRIP_AUDIO (child->codec)); - samples_per_frame = ogmrip_audio_get_samples_per_frame (OGMRIP_AUDIO (child->codec)); -+ ogmrip_codec_get_framerate (OGMRIP_CODEC (child->codec), &numerator, &denominator); - -- return (gint64) length * bitrate * container->priv->overhead / (gdouble) samples_per_frame; -+ return (gint64) length * sample_rate * denominator * container->priv->overhead / (gdouble) (samples_per_frame * numerator); - } - - static gint64 diff --git a/multimedia/ogmrip/pkg-plist b/multimedia/ogmrip/pkg-plist index 5f9adbbd4f4a..6cd43d87d63e 100644 --- a/multimedia/ogmrip/pkg-plist +++ b/multimedia/ogmrip/pkg-plist @@ -1,82 +1,89 @@ -@comment $FreeBSD$ bin/dvdcpy -bin/ogmrip -bin/srttool -bin/subp2pgm +%%GUI_SUPPORT%%bin/ogmrip +%%SRT_SUPPORT%%bin/srttool +%%SRT_SUPPORT%%bin/subp2pgm +%%THEORA_SUPPORT%%bin/theoraenc +%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-audio-chooser.h +%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-chapter-list.h +%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-chooser.h +%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-drive-dialog.h +%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-gtk.h +%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-subtitle-chooser.h +%%GUI_SUPPORT%%include/ogmdvd/ogmdvd-title-chooser.h include/ogmdvd/ogmdvd.h -include/ogmdvd/ogmdvd-audio-chooser.h -include/ogmdvd/ogmdvd-chapter-list.h -include/ogmdvd/ogmdvd-drive-chooser.h -include/ogmdvd/ogmdvd-drive-dialog.h -include/ogmdvd/ogmdvd-gtk.h -include/ogmdvd/ogmdvd-subtitle-chooser.h -include/ogmdvd/ogmdvd-title-chooser.h +include/ogmjob/ogmjob-bin.h +include/ogmjob/ogmjob-container.h +include/ogmjob/ogmjob-enums.h +include/ogmjob/ogmjob-exec.h +include/ogmjob/ogmjob-list.h +include/ogmjob/ogmjob-marshal.h +include/ogmjob/ogmjob-pipeline.h +include/ogmjob/ogmjob-queue.h +include/ogmjob/ogmjob-spawn.h +include/ogmjob/ogmjob.h +%%FAAC_SUPPORT%%include/ogmrip/ogmrip-aac.h include/ogmrip/ogmrip-acopy.h include/ogmrip/ogmrip-audio.h include/ogmrip/ogmrip-avi.h +include/ogmrip/ogmrip-chapters.h include/ogmrip/ogmrip-codec.h include/ogmrip/ogmrip-container.h include/ogmrip/ogmrip-dvdcpy.h -include/ogmrip/ogmrip-lavc.h -%%MKV_SUPPORT%%include/ogmrip/ogmrip-mkv.h -include/ogmrip/ogmrip-chapters.h include/ogmrip/ogmrip-fs.h include/ogmrip/ogmrip-init.h +include/ogmrip/ogmrip-lavc.h +%%MATROSKA_SUPPORT%%include/ogmrip/ogmrip-mkv.h include/ogmrip/ogmrip-mp3.h include/ogmrip/ogmrip-mp4.h -include/ogmrip/ogmrip-theora.h include/ogmrip/ogmrip-ogg.h -include/ogmrip/ogmrip-srt.h +%%SRT_SUPPORT%%include/ogmrip/ogmrip-srt.h include/ogmrip/ogmrip-subp.h +%%THEORA_SUPPORT%%include/ogmrip/ogmrip-theora.h +include/ogmrip/ogmrip-version.h include/ogmrip/ogmrip-video.h include/ogmrip/ogmrip-vobsub.h include/ogmrip/ogmrip-vorbis.h include/ogmrip/ogmrip-wav.h -%%X264_SUPPORT%%include/ogmrip/ogmrip-x264.h +include/ogmrip/ogmrip-x264.h include/ogmrip/ogmrip-xvid.h include/ogmrip/ogmrip.h -include/ogmjob/ogmjob-bin.h -include/ogmjob/ogmjob-container.h -include/ogmjob/ogmjob-enums.h -include/ogmjob/ogmjob-exec.h -include/ogmjob/ogmjob-list.h -include/ogmjob/ogmjob-marshal.h -include/ogmjob/ogmjob-pipeline.h -include/ogmjob/ogmjob-queue.h -include/ogmjob/ogmjob-spawn.h -include/ogmjob/ogmjob.h +%%GUI_SUPPORT%%lib/libogmdvd-gtk.a +%%GUI_SUPPORT%%lib/libogmdvd-gtk.la +%%GUI_SUPPORT%%lib/libogmdvd-gtk.so +%%GUI_SUPPORT%%lib/libogmdvd-gtk.so.0 lib/libogmdvd.a lib/libogmdvd.la lib/libogmdvd.so lib/libogmdvd.so.0 -lib/libogmdvd-gtk.a -lib/libogmdvd-gtk.la -lib/libogmdvd-gtk.so -lib/libogmdvd-gtk.so.0 -lib/libogmrip.a -lib/libogmrip.la -lib/libogmrip.so -lib/libogmrip.so.0 lib/libogmjob.a lib/libogmjob.la lib/libogmjob.so lib/libogmjob.so.0 +lib/libogmrip.a +lib/libogmrip.la +lib/libogmrip.so +lib/libogmrip.so.0 libdata/pkgconfig/ogmdvd.pc -libdata/pkgconfig/ogmrip.pc libdata/pkgconfig/ogmjob.pc -share/gnome/applications/ogmrip.desktop -share/gnome/ogmrip/ogmrip-crop.glade -share/gnome/ogmrip/ogmrip-main.glade -share/gnome/ogmrip/ogmrip-options.glade -share/gnome/ogmrip/ogmrip-pref.glade -share/gnome/ogmrip/ogmrip-progress.glade -share/gnome/ogmrip/ogmrip-spell.glade -share/gnome/ogmrip/ogmrip-ui.xml -share/gnome/ogmrip/ogmrip.xml -share/gnome/ogmrip/ogmrip.xsd -share/gnome/ogmrip/xml.xsd -share/gnome/pixmaps/ogmrip.png -@dirrm share/gnome/ogmrip +libdata/pkgconfig/ogmrip.pc +locale/cs/LC_MESSAGES/ogmrip.mo +locale/de/LC_MESSAGES/ogmrip.mo +locale/en/LC_MESSAGES/ogmrip.mo +locale/fr/LC_MESSAGES/ogmrip.mo +locale/pl/LC_MESSAGES/ogmrip.mo +%%GUI_SUPPORT%%share/applications/ogmrip.desktop +%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-crop.glade +%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-main.glade +%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-options.glade +%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-pref.glade +%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-progress.glade +%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-spell.glade +%%GUI_SUPPORT%%%%DATADIR%%/ogmrip-ui.xml +%%DATADIR%%/ogmrip.xml +%%DATADIR%%/ogmrip.xsd +%%DATADIR%%/xml.xsd +%%GUI_SUPPORT%%share/pixmaps/ogmrip.png +@dirrm %%DATADIR%% @dirrm include/ogmrip @dirrm include/ogmjob @dirrm include/ogmdvd |