diff options
author | Steve Dibb <beandog@gentoo.org> | 2006-10-23 04:56:27 +0000 |
---|---|---|
committer | Steve Dibb <beandog@gentoo.org> | 2006-10-23 04:56:27 +0000 |
commit | dff5d0cbd2083413fb249669c6661a8cf3818b8e (patch) | |
tree | fd29e42d44eb25ebde87bf79317a97f60dcda734 /media-video/ogmrip | |
parent | Version bump, remove old patches (diff) | |
download | gentoo-2-dff5d0cbd2083413fb249669c6661a8cf3818b8e.tar.gz gentoo-2-dff5d0cbd2083413fb249669c6661a8cf3818b8e.tar.bz2 gentoo-2-dff5d0cbd2083413fb249669c6661a8cf3818b8e.zip |
Version bump, remove old patches
(Portage version: 2.1.1-r1)
(Unsigned Manifest commit)
Diffstat (limited to 'media-video/ogmrip')
-rw-r--r-- | media-video/ogmrip/Manifest | 36 | ||||
-rw-r--r-- | media-video/ogmrip/files/ogmrip-0.9.0-gcc4.patch | 175 | ||||
-rw-r--r-- | media-video/ogmrip/files/ogmrip-0.9.0-lang.patch | 12 | ||||
-rw-r--r-- | media-video/ogmrip/files/ogmrip-0.9.0-mplayercvs.patch | 32 | ||||
-rw-r--r-- | media-video/ogmrip/files/ogmrip-0.9.0-types.patch | 20 |
5 files changed, 16 insertions, 259 deletions
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest index 7ee89878886b..1c06246fa21e 100644 --- a/media-video/ogmrip/Manifest +++ b/media-video/ogmrip/Manifest @@ -1,28 +1,21 @@ -AUX ogmrip-0.9.0-gcc4.patch 5279 RMD160 092ed7eadab3a8a56f26f0a2b47fc5121db04f20 SHA1 6ad2b43816ac2ed4fdc00a5148716d69b5a132d0 SHA256 7165a632039d2df3cdd2677e82a1fdcd6fefc9ac3c4dc33896c03afb36269792 -MD5 0b8ceac327eb68f927a2fbb841bfb53a files/ogmrip-0.9.0-gcc4.patch 5279 -RMD160 092ed7eadab3a8a56f26f0a2b47fc5121db04f20 files/ogmrip-0.9.0-gcc4.patch 5279 -SHA256 7165a632039d2df3cdd2677e82a1fdcd6fefc9ac3c4dc33896c03afb36269792 files/ogmrip-0.9.0-gcc4.patch 5279 -AUX ogmrip-0.9.0-lang.patch 450 RMD160 df73b14cce05835e6fe8b570c80a4d54f3f39ed2 SHA1 523e05c98ce5f2f4ac034796d6b1583b559b6302 SHA256 256d22d224548dd63824e6c78ce7250536d39bf53a105b2e0cb4f7b6e4de51c4 -MD5 d3c45dfbfd5046c58d6a1e774471e280 files/ogmrip-0.9.0-lang.patch 450 -RMD160 df73b14cce05835e6fe8b570c80a4d54f3f39ed2 files/ogmrip-0.9.0-lang.patch 450 -SHA256 256d22d224548dd63824e6c78ce7250536d39bf53a105b2e0cb4f7b6e4de51c4 files/ogmrip-0.9.0-lang.patch 450 -AUX ogmrip-0.9.0-mplayercvs.patch 1681 RMD160 67d32a1c28ac7ee79a5e25913726881663ed0901 SHA1 587261e899e62886ce6a552c4cf5da531b2e272d SHA256 73fb2d14c5ed10ab7517aaef0305be55f870e2c1061a7708b8d28fdcc4d0dd4f -MD5 3457036780fd123b29fc2ac6c1ff4a64 files/ogmrip-0.9.0-mplayercvs.patch 1681 -RMD160 67d32a1c28ac7ee79a5e25913726881663ed0901 files/ogmrip-0.9.0-mplayercvs.patch 1681 -SHA256 73fb2d14c5ed10ab7517aaef0305be55f870e2c1061a7708b8d28fdcc4d0dd4f files/ogmrip-0.9.0-mplayercvs.patch 1681 -AUX ogmrip-0.9.0-types.patch 507 RMD160 f3ab54f809b9992e3893991dc2bf82397e1a8cca SHA1 3effadcb42a6362ea6a1fc5fe7b201953ae13749 SHA256 3cb93e93e1e1f9b838d9049ec53bdb4a8b48f1424a4f8160525d061036aeac13 -MD5 1e250164579d88f8a5782720ceb20346 files/ogmrip-0.9.0-types.patch 507 -RMD160 f3ab54f809b9992e3893991dc2bf82397e1a8cca files/ogmrip-0.9.0-types.patch 507 -SHA256 3cb93e93e1e1f9b838d9049ec53bdb4a8b48f1424a4f8160525d061036aeac13 files/ogmrip-0.9.0-types.patch 507 +AUX ogmrip-0.10.0_rc4-amd64.patch 4155 RMD160 858ee52a46d49247676f7a009b24e340833485fe SHA1 5a40f8c4452a9dfad17f2f3385e68b4f4eb02a0f SHA256 5dcdc438a3902e734d5cb77d3d3fa4428ba23af97bd7c375e85d9766adee1af8 +MD5 e2147878ec3b468d909f0bd8f0136252 files/ogmrip-0.10.0_rc4-amd64.patch 4155 +RMD160 858ee52a46d49247676f7a009b24e340833485fe files/ogmrip-0.10.0_rc4-amd64.patch 4155 +SHA256 5dcdc438a3902e734d5cb77d3d3fa4428ba23af97bd7c375e85d9766adee1af8 files/ogmrip-0.10.0_rc4-amd64.patch 4155 DIST ogmrip-0.10.0-rc3.tar.gz 615230 RMD160 ffbeaa4cc0c9f48c46f150d3a99954bbd56751eb SHA1 69162a7d617c271c9f5d4da2d074ba70c204f448 SHA256 54a4cb78d837b0586283214109672ca860d79ed113c246c057cdd4782670ac04 +DIST ogmrip-0.10.0-rc4.tar.gz 622444 RMD160 944b2ff3d0a67435577254e9b88bf2ab7059f001 SHA1 4d5f499b989a80eeef136b38fb839f7c30ca554f SHA256 4bc6b04a59463a1c8fd99ed42aead4600b1b9c05f785c3e9afcd9b64e948ed17 EBUILD ogmrip-0.10.0_rc3.ebuild 1850 RMD160 1dfe89de386fc4b8d3a5f34c7d7b6c006a4ee234 SHA1 b0766ccb4b8b4f90848bce2c131e09961b414a37 SHA256 6b3d163caaf92a37849b32c513d03c9ff313296c83f2a4acd989456f04738c33 MD5 55f3923e64f588e355eae27b8a2367e4 ogmrip-0.10.0_rc3.ebuild 1850 RMD160 1dfe89de386fc4b8d3a5f34c7d7b6c006a4ee234 ogmrip-0.10.0_rc3.ebuild 1850 SHA256 6b3d163caaf92a37849b32c513d03c9ff313296c83f2a4acd989456f04738c33 ogmrip-0.10.0_rc3.ebuild 1850 -MISC ChangeLog 2596 RMD160 ac199fa0a524b9f3a29b61c2798693fb47d3e34e SHA1 3528ed0cbb2cb3ce7641f5b7d62ce29f6be65770 SHA256 644644933405b447b7e8c0ceaec22986ee651983cd4b5c2e4bcecf751c6f3e31 -MD5 54cf754d64f240d21aebfebee91bd4af ChangeLog 2596 -RMD160 ac199fa0a524b9f3a29b61c2798693fb47d3e34e ChangeLog 2596 -SHA256 644644933405b447b7e8c0ceaec22986ee651983cd4b5c2e4bcecf751c6f3e31 ChangeLog 2596 +EBUILD ogmrip-0.10.0_rc4.ebuild 1925 RMD160 72eb26cb090b0d318b58da6c29bf47cdc67e08af SHA1 7cc9ce9ac8df5535e908047d5131ce0936426f62 SHA256 1935e78d67cea5f3de9f6f5591f2e6e684346734ff85262e1c3938306e424655 +MD5 e6704ad2a7d747b331b5fb4d3fcc8f85 ogmrip-0.10.0_rc4.ebuild 1925 +RMD160 72eb26cb090b0d318b58da6c29bf47cdc67e08af ogmrip-0.10.0_rc4.ebuild 1925 +SHA256 1935e78d67cea5f3de9f6f5591f2e6e684346734ff85262e1c3938306e424655 ogmrip-0.10.0_rc4.ebuild 1925 +MISC ChangeLog 2919 RMD160 6449f888b4d5cbcba9b28c3271ad4ca691f7680e SHA1 850fb46cfde63b4c2f592536173d1db0d229a6e6 SHA256 5ac46442fd673d8dce2830e7bfdf852cbc949c8a1e25f03a0db5942899272c10 +MD5 10dd5be20f48448bc7ccc7f565e36606 ChangeLog 2919 +RMD160 6449f888b4d5cbcba9b28c3271ad4ca691f7680e ChangeLog 2919 +SHA256 5ac46442fd673d8dce2830e7bfdf852cbc949c8a1e25f03a0db5942899272c10 ChangeLog 2919 MISC metadata.xml 380 RMD160 d2b63fc7b96b0de1978f06fd8f70a8a55f9c80e7 SHA1 8709d1b5015b382503025066890eecee94efffc7 SHA256 70617929adf4909735883031a2a9c86ea5e808f4bee7037ecca3c490d68c74bd MD5 949f6911677e3fd917e59df12a09905c metadata.xml 380 RMD160 d2b63fc7b96b0de1978f06fd8f70a8a55f9c80e7 metadata.xml 380 @@ -30,3 +23,6 @@ SHA256 70617929adf4909735883031a2a9c86ea5e808f4bee7037ecca3c490d68c74bd metadata MD5 5ec568c4717a7c4f46c8562d9b46e24e files/digest-ogmrip-0.10.0_rc3 253 RMD160 d78173e7b031ca8bcefcb22461c68bb14698ca71 files/digest-ogmrip-0.10.0_rc3 253 SHA256 976252c2fbd9bd7c47be5b0d8fb8c4f1575d14f672e1b040af48ccaad57fda42 files/digest-ogmrip-0.10.0_rc3 253 +MD5 eafe3f35e7863d5c3d42ecaa3308fcd8 files/digest-ogmrip-0.10.0_rc4 253 +RMD160 182d15ddeeca31963d1d2f1110492f517c0482bd files/digest-ogmrip-0.10.0_rc4 253 +SHA256 896db7a42c2008c50a9feca307b93cd879b8f1d231544859381b12e264392bb3 files/digest-ogmrip-0.10.0_rc4 253 diff --git a/media-video/ogmrip/files/ogmrip-0.9.0-gcc4.patch b/media-video/ogmrip/files/ogmrip-0.9.0-gcc4.patch deleted file mode 100644 index d46ac494489a..000000000000 --- a/media-video/ogmrip/files/ogmrip-0.9.0-gcc4.patch +++ /dev/null @@ -1,175 +0,0 @@ ---- libogmrip/ogmrip-codec.h.orig Wed Aug 24 17:44:16 2005 -+++ libogmrip/ogmrip-codec.h Wed Aug 24 17:44:33 2005 -@@ -59,10 +59,10 @@ - - void ogmrip_codec_set_chapters (OGMRipCodec *codec, - guint start, -- guint end); -+ gint end); - void ogmrip_codec_get_chapters (OGMRipCodec *codec, - guint *start, -- guint *end); -+ gint *end); - - G_END_DECLS - ---- libogmrip/ogmrip-codec.c.orig Wed Aug 24 17:44:10 2005 -+++ libogmrip/ogmrip-codec.c Wed Aug 24 17:45:10 2005 -@@ -115,17 +115,26 @@ - } - - void --ogmrip_codec_set_chapters (OGMRipCodec *codec, guint start, guint end) -+ogmrip_codec_set_chapters (OGMRipCodec *codec, guint start, gint end) - { - g_return_if_fail (OGMRIP_IS_CODEC (codec)); - - codec->priv->dirty = TRUE; -- codec->priv->start = MIN (start, end); -- codec->priv->end = MAX (start, end); -+ -+ if (end < 0) -+ { -+ codec->priv->start = start; -+ codec->priv->end = -1; -+ } -+ else -+ { -+ codec->priv->start = MIN (start, end); -+ codec->priv->end = MAX (start, end); -+ } - } - - void --ogmrip_codec_get_chapters (OGMRipCodec *codec, guint *start, guint *end) -+ogmrip_codec_get_chapters (OGMRipCodec *codec, guint *start, gint *end) - { - g_return_if_fail (OGMRIP_IS_CODEC (codec)); - g_return_if_fail (start != NULL); ---- libogmrip/ogmrip-backend.c.orig Wed Aug 24 17:44:22 2005 -+++ libogmrip/ogmrip-backend.c Wed Aug 24 17:47:30 2005 -@@ -274,7 +274,8 @@ - - GPtrArray *argv; - const gchar *device; -- gint vid, aid, start, end; -+ gint vid, aid, end; -+ guint start; - - g_return_val_if_fail (OGMRIP_IS_AUDIO (audio), NULL); - -@@ -370,7 +371,8 @@ - - GPtrArray *argv; - const gchar *device; -- gint vid, aid, start, end; -+ gint vid, aid, end; -+ guint start; - - g_return_val_if_fail (OGMRIP_IS_AUDIO (audio), NULL); - -@@ -619,8 +621,8 @@ - GString *options; - - const gchar *device; -- gint vid, pass, start, end; -- gint bitrate; -+ gint vid, pass, bitrate, end; -+ guint start; - - g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL); - -@@ -729,9 +731,8 @@ - GString *options; - - const gchar *device; -- gint vid, pass, start, end; -- guint cmp, precmp, subcmp; -- gint dia, predia; -+ gint vid, pass, end, dia, predia; -+ guint start, cmp, precmp, subcmp; - - g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL); - -@@ -836,7 +837,8 @@ - GString *options; - - const gchar *device; -- gint vid, pass, start, end/*, subq*/; -+ gint vid, pass, end/*, subq*/; -+ guint start; - - g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL); - -@@ -936,7 +938,9 @@ - GPtrArray *argv; - - const gchar *device; -- gint vid, start, end; -+ gint vid, end; -+ guint start; -+ - guint crop_x, crop_y, crop_width, crop_height; - guint scale_width, scale_height; - gboolean crop, scale; -@@ -1407,7 +1411,8 @@ - - GPtrArray *argv; - const gchar *device; -- gint vid, sid, start, end; -+ gint vid, sid, end; -+ guint start; - - g_return_val_if_fail (OGMRIP_IS_SUBP (subp), NULL); - ---- subrip/spudec.c.orig Wed Aug 24 17:48:10 2005 -+++ subrip/spudec.c Wed Aug 24 17:48:22 2005 -@@ -365,7 +365,7 @@ - unsigned int next_off; - unsigned int start_pts = 0; - unsigned int end_pts = 0; -- unsigned int current_nibble[2]; -+ unsigned int current_nibble[2] = { 0, 0 }; - unsigned int control_start; - unsigned int display = 0; - unsigned int start_col = 0; ---- subrip/vobsub.h.orig Wed Aug 24 17:49:10 2005 -+++ subrip/vobsub.h Wed Aug 24 17:49:54 2005 -@@ -13,7 +13,7 @@ - extern int vobsub_get_packet (void *vobhandle, float pts, void **data, - int *timestamp); - extern int vobsub_get_next_packet (void *vobhandle, void **data, -- int *timestamp); -+ unsigned int *timestamp); - extern void vobsub_close (void *this); - extern unsigned int vobsub_get_indexes_count (void * /* vobhandle */ ); - extern char *vobsub_get_id (void * /* vobhandle */ , -@@ -27,7 +27,7 @@ - extern void vobsub_out_output (void *me, const unsigned char *packet, int len, - double pts); - extern void vobsub_out_close (void *me); --extern int vobsub_set_from_lang (void *vobhandle, unsigned char *lang); -+extern int vobsub_set_from_lang (void *vobhandle, char *lang); - extern unsigned int vobsub_get_forced_subs_flag (void const *const vobhandle); - extern void vobsub_seek (void *vobhandle, float pts); - ---- subrip/vobsub.c.orig Wed Aug 24 17:48:45 2005 -+++ subrip/vobsub.c Wed Aug 24 17:49:45 2005 -@@ -1417,7 +1417,7 @@ - } - - int --vobsub_set_from_lang (void *vobhandle, unsigned char *lang) -+vobsub_set_from_lang (void *vobhandle, char *lang) - { - int i; - vobsub_t *vob = (vobsub_t *) vobhandle; -@@ -1471,7 +1471,7 @@ - } - - int --vobsub_get_next_packet (void *vobhandle, void **data, int *timestamp) -+vobsub_get_next_packet (void *vobhandle, void **data, unsigned int *timestamp) - { - vobsub_t *vob = (vobsub_t *) vobhandle; - if (vob->spu_streams && 0 <= vobsub_id diff --git a/media-video/ogmrip/files/ogmrip-0.9.0-lang.patch b/media-video/ogmrip/files/ogmrip-0.9.0-lang.patch deleted file mode 100644 index a99f4a78a798..000000000000 --- a/media-video/ogmrip/files/ogmrip-0.9.0-lang.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/ogmrip-pref.c.orig 2005-08-18 21:57:57.667814250 +0200 -+++ src/ogmrip-pref.c 2005-08-18 22:00:19.612685250 +0200 -@@ -199,8 +199,7 @@ - GtkTreeModel *model; - - model = gtk_combo_box_get_model (combo); -- ogmrip_pref_set_active_lang (combo, -- CLAMP (gconf_value_get_int (entry->value), 0, gtk_tree_model_iter_n_children (model, NULL) - 1)); -+ ogmrip_pref_set_active_lang (combo, gconf_value_get_int (entry->value)); - } - - static void diff --git a/media-video/ogmrip/files/ogmrip-0.9.0-mplayercvs.patch b/media-video/ogmrip/files/ogmrip-0.9.0-mplayercvs.patch deleted file mode 100644 index f4efbfe119f0..000000000000 --- a/media-video/ogmrip/files/ogmrip-0.9.0-mplayercvs.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -N -u -r ogmrip-0.9.0/configure.in ogmrip-0.9.0-new/configure.in ---- ogmrip-0.9.0/configure.in 2005-06-28 13:55:47.000000000 +0200 -+++ ogmrip-0.9.0-new/configure.in 2006-03-14 13:46:34.740041528 +0100 -@@ -153,17 +153,19 @@ - fi - - if $MPLAYER_PROG | grep -q "MPlayer dev-CVS"; then -- AC_MSG_ERROR(OGMRip does support CVS versions of mplayer. You need an official release. Find it on http://www.mplayerhq.hu) --fi -+ AC_DEFINE_UNQUOTED(MPLAYER_PRE, 1, [Mplayer pre version number]) -+ AC_DEFINE_UNQUOTED(MPLAYER_PRE, 7, [Mplayer pre version number]) -+else - --MPLAYER_MAJOR=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer \([[0-1]]\).*%\1%'` --AC_DEFINE_UNQUOTED(MPLAYER_MAJOR, $MPLAYER_MAJOR, [Mplayer major version number]) -+ MPLAYER_MAJOR=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer \([[0-1]]\).*%\1%'` -+ AC_DEFINE_UNQUOTED(MPLAYER_MAJOR, $MPLAYER_MAJOR, [Mplayer major version number]) - --if $MPLAYER_PROG | grep -q "MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then -- MPLAYER_PRE=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'` -- AC_DEFINE_UNQUOTED(MPLAYER_PRE, $MPLAYER_PRE, [Mplayer pre version number]) --else -- AC_DEFINE_UNQUOTED(MPLAYER_PRE, 0, [Mplayer pre version number]) -+ if $MPLAYER_PROG | grep -q "MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then -+ MPLAYER_PRE=`$MPLAYER_PROG | head -n 1 | $SED_PROG -e 's%MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'` -+ AC_DEFINE_UNQUOTED(MPLAYER_PRE, $MPLAYER_PRE, [Mplayer pre version number]) -+ else -+ AC_DEFINE_UNQUOTED(MPLAYER_PRE, 0, [Mplayer pre version number]) -+ fi - fi - - dnl ************************************************************** diff --git a/media-video/ogmrip/files/ogmrip-0.9.0-types.patch b/media-video/ogmrip/files/ogmrip-0.9.0-types.patch deleted file mode 100644 index 348d5505a48f..000000000000 --- a/media-video/ogmrip/files/ogmrip-0.9.0-types.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libogmdvd/ogmdvd.c.orig 2005-06-15 11:54:18.000000000 +0200 -+++ libogmdvd/ogmdvd.c 2006-06-02 16:57:23.000000000 +0200 -@@ -20,6 +20,7 @@ - #include "ogmdvd.h" - - #include <stdio.h> -+#include <stdint.h> - #include <string.h> - - #include <dvdread/ifo_types.h> ---- dvdcpy/dvdcpy.c.orig 2005-06-26 23:16:51.000000000 +0200 -+++ dvdcpy/dvdcpy.c 2006-06-02 16:58:02.000000000 +0200 -@@ -18,6 +18,7 @@ - - #include "config.h" - -+#include <stdint.h> - #include <dvdread/dvd_reader.h> - #include <dvdread/ifo_read.h> - |