rpms/xorg-x11-drv-catalyst/F-14 .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 xorg-x11-drv-catalyst.spec, 1.7, 1.8
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3725/F-14
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Fri Jul 29 2011 Stewart Adam <s.adam at diffingo.com> 11.7-1
- Update to Catalyst 11.7 (internal version 8.87.2)
- Fix previous changelog entry format
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 18 Jun 2011 21:30:42 -0000 1.7
+++ .cvsignore 30 Jul 2011 00:40:49 -0000 1.8
@@ -1 +1 @@
-ati-driver-installer-11-6-x86.x86_64.run
+ati-driver-installer-11-7-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 18 Jun 2011 21:30:42 -0000 1.6
+++ sources 30 Jul 2011 00:40:49 -0000 1.7
@@ -1 +1 @@
-ff901cfa828006e25e9d6718a515b5c0 ati-driver-installer-11-6-x86.x86_64.run
+acebb812d4c057766828df0bf572e8ae ati-driver-installer-11-7-x86.x86_64.run
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-catalyst.spec 18 Jun 2011 21:30:42 -0000 1.7
+++ xorg-x11-drv-catalyst.spec 30 Jul 2011 00:40:49 -0000 1.8
@@ -7,13 +7,13 @@
%endif
Name: xorg-x11-drv-catalyst
-Version: 11.6
+Version: 11.7
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: catalyst-README.Fedora
Source3: catalyst-config-display
Source4: catalyst-init
@@ -346,8 +346,12 @@
%{_includedir}/fglrx/
%changelog
+* Fri Jul 29 2011 Stewart Adam <s.adam at diffingo.com> 11.7-1
+- Update to Catalyst 11.7 (internal version 8.87.2)
+- Fix previous changelog entry format
+
* Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1
-* Update to Catalyst 11.6 (internal version 8.86.1)
+- Update to Catalyst 11.6 (internal version 8.86.1)
* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11.4-1
- Update to Catalyst 11.4 (internal version 8.84.1)
12 years, 9 months
- 1
- 0
rpms/xorg-x11-drv-catalyst/F-15 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 xorg-x11-drv-catalyst.spec, 1.4, 1.5
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3725/F-15
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Fri Jul 29 2011 Stewart Adam <s.adam at diffingo.com> 11.7-1
- Update to Catalyst 11.7 (internal version 8.87.2)
- Fix previous changelog entry format
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 18 Jun 2011 20:24:21 -0000 1.5
+++ .cvsignore 30 Jul 2011 00:40:50 -0000 1.6
@@ -1 +1 @@
-ati-driver-installer-11-6-x86.x86_64.run
+ati-driver-installer-11-7-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 18 Jun 2011 20:24:22 -0000 1.4
+++ sources 30 Jul 2011 00:40:50 -0000 1.5
@@ -1 +1 @@
-ff901cfa828006e25e9d6718a515b5c0 ati-driver-installer-11-6-x86.x86_64.run
+acebb812d4c057766828df0bf572e8ae ati-driver-installer-11-7-x86.x86_64.run
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-catalyst.spec 18 Jun 2011 20:24:22 -0000 1.4
+++ xorg-x11-drv-catalyst.spec 30 Jul 2011 00:40:50 -0000 1.5
@@ -7,13 +7,13 @@
%endif
Name: xorg-x11-drv-catalyst
-Version: 11.6
+Version: 11.7
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: catalyst-README.Fedora
Source3: catalyst-config-display
Source4: catalyst-init
@@ -346,8 +346,12 @@
%{_includedir}/fglrx/
%changelog
+* Fri Jul 29 2011 Stewart Adam <s.adam at diffingo.com> 11.7-1
+- Update to Catalyst 11.7 (internal version 8.87.2)
+- Fix previous changelog entry format
+
* Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1
-* Update to Catalyst 11.6 (internal version 8.86.1)
+- Update to Catalyst 11.6 (internal version 8.86.1)
* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11.4-1
- Update to Catalyst 11.4 (internal version 8.84.1)
12 years, 9 months
- 1
- 0
rpms/catalyst-kmod/F-14 .cvsignore, 1.8, 1.9 catalyst-kmod.spec, 1.16, 1.17 sources, 1.7, 1.8
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/catalyst-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3682/F-14
Modified Files:
.cvsignore catalyst-kmod.spec sources
Log Message:
* Fri Jul 29 2011 Stewart Adam <s.adam at diffingo.com> 11.7-1
- Update to Catalyst 11.7 (internal version 8.87.2)
- Fix previous changelog entry format
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-14/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 18 Jun 2011 20:05:55 -0000 1.8
+++ .cvsignore 30 Jul 2011 00:40:19 -0000 1.9
@@ -1 +1 @@
-catalyst-kmod-data-11.6.tar.bz2
+catalyst-kmod-data-11.7.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-14/catalyst-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- catalyst-kmod.spec 18 Jun 2011 20:06:50 -0000 1.16
+++ catalyst-kmod.spec 30 Jul 2011 00:40:19 -0000 1.17
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -12,7 +12,7 @@
%endif
Name: catalyst-kmod
-Version: 11.6
+Version: 11.7
Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
@@ -97,8 +97,12 @@
%changelog
+* Fri Jul 29 2011 Stewart Adam <s.adam at diffingo.com> 11.7-1
+- Update to Catalyst 11.7 (internal version 8.87.2)
+- Fix previous changelog entry format
+
* Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1
-* Update to Catalyst 11.6 (internal version 8.86.1)
+- Update to Catalyst 11.6 (internal version 8.86.1)
* Sat May 28 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 11.4-1.2
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-14/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 18 Jun 2011 20:05:55 -0000 1.7
+++ sources 30 Jul 2011 00:40:19 -0000 1.8
@@ -1 +1 @@
-b5725a41e9aa5d0edffca7ee77b506ea catalyst-kmod-data-11.6.tar.bz2
+41d22690df34c4797c42d4c4c3b6c020 catalyst-kmod-data-11.7.tar.bz2
12 years, 9 months
- 1
- 0
rpms/catalyst-kmod/F-15 .cvsignore, 1.6, 1.7 catalyst-kmod.spec, 1.12, 1.13 sources, 1.5, 1.6
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/catalyst-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3682/F-15
Modified Files:
.cvsignore catalyst-kmod.spec sources
Log Message:
* Fri Jul 29 2011 Stewart Adam <s.adam at diffingo.com> 11.7-1
- Update to Catalyst 11.7 (internal version 8.87.2)
- Fix previous changelog entry format
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-15/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 18 Jun 2011 20:06:07 -0000 1.6
+++ .cvsignore 30 Jul 2011 00:40:20 -0000 1.7
@@ -1 +1 @@
-catalyst-kmod-data-11.6.tar.bz2
+catalyst-kmod-data-11.7.tar.bz2
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-15/catalyst-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- catalyst-kmod.spec 12 Jul 2011 11:00:59 -0000 1.12
+++ catalyst-kmod.spec 30 Jul 2011 00:40:20 -0000 1.13
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -12,8 +12,8 @@
%endif
Name: catalyst-kmod
-Version: 11.6
-Release: 1%{?dist}.1
+Version: 11.7
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -97,11 +97,15 @@
%changelog
+* Fri Jul 29 2011 Stewart Adam <s.adam at diffingo.com> 11.7-1
+- Update to Catalyst 11.7 (internal version 8.87.2)
+- Fix previous changelog entry format
+
* Tue Jul 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.6-1.1
- Rebuild for updated kernel
* Sat Jun 18 2011 Stewart Adam <s.adam at diffingo.com> 11.6-1
-* Update to Catalyst 11.6 (internal version 8.86.1)
+- Update to Catalyst 11.6 (internal version 8.86.1)
* Wed Jun 15 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 11.4-1.4
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-15/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 18 Jun 2011 20:06:07 -0000 1.5
+++ sources 30 Jul 2011 00:40:20 -0000 1.6
@@ -1 +1 @@
-b5725a41e9aa5d0edffca7ee77b506ea catalyst-kmod-data-11.6.tar.bz2
+41d22690df34c4797c42d4c4c3b6c020 catalyst-kmod-data-11.7.tar.bz2
12 years, 9 months
- 1
- 0
rpms/ogmrip/F-14 ogmrip.spec,1.10,1.11
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24405
Modified Files:
ogmrip.spec
Log Message:
Disable unneeded patch
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-14/ogmrip.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ogmrip.spec 29 Jul 2011 10:28:09 -0000 1.10
+++ ogmrip.spec 29 Jul 2011 22:41:01 -0000 1.11
@@ -69,7 +69,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch2 -p0
%patch3 -p0
12 years, 9 months
- 1
- 0
rpms/ogmrip/F-15 ogmrip-0.13.6-audio-quality.patch, NONE, 1.1 ogmrip-0.13.6-g_const_return_deprecated.patch, NONE, 1.1 ogmrip.spec, 1.9, 1.10
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31091
Modified Files:
ogmrip.spec
Added Files:
ogmrip-0.13.6-audio-quality.patch
ogmrip-0.13.6-g_const_return_deprecated.patch
Log Message:
* Tue Jul 26 2011 Gianluca Sforna <giallu(a)gmail.com> - 0.13.6-2
- Fix build with newer GLib
- Fix preferences bug with upstream patch
ogmrip-0.13.6-audio-quality.patch:
ogmrip-profile-editor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE ogmrip-0.13.6-audio-quality.patch ---
Index: src/ogmrip-profile-editor.c
===================================================================
--- src/ogmrip-profile-editor.c (révision 2035)
+++ src/ogmrip-profile-editor.c (copie de travail)
@@ -951,7 +951,7 @@
dialog->priv->audio_quality_label = glade_xml_get_widget (xml, "audio-quality-label");
dialog->priv->audio_quality_spin = glade_xml_get_widget (xml, "audio-quality-spin");
ogmrip_settings_bind (settings, dialog->priv->profile_section,
- OGMRIP_GCONF_AUDIO_QUALITY, G_OBJECT (widget), "value");
+ OGMRIP_GCONF_AUDIO_QUALITY, G_OBJECT (dialog->priv->audio_quality_spin), "value");
widget = glade_xml_get_widget (xml, "normalize-check");
ogmrip_settings_bind (settings, dialog->priv->profile_section,
ogmrip-0.13.6-g_const_return_deprecated.patch:
libogmdvd/ogmdvd-disc.c | 8 ++++----
libogmdvd/ogmdvd-disc.h | 6 +++---
libogmdvd/ogmdvd-labels.c | 20 ++++++++++----------
libogmdvd/ogmdvd-labels.h | 20 ++++++++++----------
libogmdvd/ogmdvd-title.c | 2 +-
libogmdvd/ogmdvd-title.h | 2 +-
libogmrip/ogmrip-audio-codec.c | 2 +-
libogmrip/ogmrip-audio-codec.h | 2 +-
libogmrip/ogmrip-chapters.c | 2 +-
libogmrip/ogmrip-chapters.h | 2 +-
libogmrip/ogmrip-codec.c | 2 +-
libogmrip/ogmrip-codec.h | 2 +-
libogmrip/ogmrip-container.c | 6 +++---
libogmrip/ogmrip-container.h | 6 +++---
libogmrip/ogmrip-edl.c | 2 +-
libogmrip/ogmrip-edl.h | 2 +-
libogmrip/ogmrip-encoding.c | 16 ++++++++--------
libogmrip/ogmrip-encoding.h | 14 +++++++-------
libogmrip/ogmrip-fs.c | 4 ++--
libogmrip/ogmrip-fs.h | 4 ++--
libogmrip/ogmrip-lavc.c | 2 +-
libogmrip/ogmrip-lavc.h | 2 +-
libogmrip/ogmrip-plugin.c | 10 +++++-----
libogmrip/ogmrip-plugin.h | 8 ++++----
libogmrip/ogmrip-subp-codec.c | 2 +-
libogmrip/ogmrip-subp-codec.h | 2 +-
26 files changed, 75 insertions(+), 75 deletions(-)
--- NEW FILE ogmrip-0.13.6-g_const_return_deprecated.patch ---
Index: libogmrip/ogmrip-fs.c
===================================================================
--- libogmrip/ogmrip-fs.c (revision 2063)
+++ libogmrip/ogmrip-fs.c (working copy)
@@ -51,7 +51,7 @@
*
* Returns: The temporaty directory
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_fs_get_tmp_dir (void)
{
if (!ogmrip_tmp_dir)
@@ -618,7 +618,7 @@
*
* Returns: The extension, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_fs_get_extension (const gchar *filename)
{
gchar *dot;
Index: libogmrip/ogmrip-chapters.c
===================================================================
--- libogmrip/ogmrip-chapters.c (revision 2063)
+++ libogmrip/ogmrip-chapters.c (working copy)
@@ -205,7 +205,7 @@
*
* Returns: The label
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_chapters_get_label (OGMRipChapters *chapters, guint n)
{
g_return_val_if_fail (OGMRIP_IS_CHAPTERS (chapters), NULL);
Index: libogmrip/ogmrip-fs.h
===================================================================
--- libogmrip/ogmrip-fs.h (revision 2063)
+++ libogmrip/ogmrip-fs.h (working copy)
@@ -30,7 +30,7 @@
#define g_chdir chdir
#endif
-G_CONST_RETURN
+const
gchar * ogmrip_fs_get_tmp_dir (void);
void ogmrip_fs_set_tmp_dir (const gchar *dir);
@@ -71,7 +71,7 @@
gchar * ogmrip_fs_get_full_path (const gchar *filename);
-G_CONST_RETURN
+const
gchar * ogmrip_fs_get_extension (const gchar *filename);
gchar * ogmrip_fs_set_extension (const gchar *filename,
const gchar *extension);
Index: libogmrip/ogmrip-codec.c
===================================================================
--- libogmrip/ogmrip-codec.c (revision 2063)
+++ libogmrip/ogmrip-codec.c (working copy)
@@ -294,7 +294,7 @@
*
* Returns: the filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_codec_get_output (OGMRipCodec *codec)
{
g_return_val_if_fail (OGMRIP_IS_CODEC (codec), NULL);
Index: libogmrip/ogmrip-chapters.h
===================================================================
--- libogmrip/ogmrip-chapters.h (revision 2063)
+++ libogmrip/ogmrip-chapters.h (working copy)
@@ -48,7 +48,7 @@
GType ogmrip_chapters_get_type (void);
OGMJobSpawn * ogmrip_chapters_new (OGMDvdTitle *title,
const gchar *output);
-G_CONST_RETURN
+const
gchar * ogmrip_chapters_get_label (OGMRipChapters *chapters,
guint n);
void ogmrip_chapters_set_label (OGMRipChapters *chapters,
Index: libogmrip/ogmrip-codec.h
===================================================================
--- libogmrip/ogmrip-codec.h (revision 2063)
+++ libogmrip/ogmrip-codec.h (working copy)
@@ -53,7 +53,7 @@
};
GType ogmrip_codec_get_type (void);
-G_CONST_RETURN
+const
gchar * ogmrip_codec_get_output (OGMRipCodec *codec);
void ogmrip_codec_set_output (OGMRipCodec *codec,
const gchar *output);
Index: libogmrip/ogmrip-lavc.c
===================================================================
--- libogmrip/ogmrip-lavc.c (revision 2063)
+++ libogmrip/ogmrip-lavc.c (working copy)
@@ -135,7 +135,7 @@
return CLAMP (quantizer, 2, 31);
}
-static G_CONST_RETURN gchar *
+static const gchar *
ogmrip_lavc_get_codec (OGMRipLavc *lavc)
{
OGMRipLavcClass *klass;
Index: libogmrip/ogmrip-lavc.h
===================================================================
--- libogmrip/ogmrip-lavc.h (revision 2063)
+++ libogmrip/ogmrip-lavc.h (working copy)
@@ -69,7 +69,7 @@
OGMRipVideoCodecClass parent_class;
/* vtable */
- G_CONST_RETURN gchar * (* get_codec) (void);
+ const gchar * (* get_codec) (void);
};
/**
Index: libogmrip/ogmrip-encoding.c
===================================================================
--- libogmrip/ogmrip-encoding.c (revision 2063)
+++ libogmrip/ogmrip-encoding.c (working copy)
@@ -359,7 +359,7 @@
return data1->nr - data2->nr;
}
-static G_CONST_RETURN gchar *
+static const gchar *
ogmrip_encoding_get_device (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3550,7 +3550,7 @@
*
* Returns: The id, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_id (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3582,7 +3582,7 @@
*
* Returns: The profile' section, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_profile (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3622,7 +3622,7 @@
*
* Returns: The name of the encoding, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_label (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3669,7 +3669,7 @@
*
* Returns: The name of the chapter, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_chapter_label (OGMRipEncoding *encoding, guint nr)
{
OGMRipChapterData *data;
@@ -3829,7 +3829,7 @@
*
* Returns: The output filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_filename (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3868,7 +3868,7 @@
*
* Returns: The log filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_logfile (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -4007,7 +4007,7 @@
*
* Returns: The FourCC, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_fourcc (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
Index: libogmrip/ogmrip-encoding.h
===================================================================
--- libogmrip/ogmrip-encoding.h (revision 2063)
+++ libogmrip/ogmrip-encoding.h (working copy)
@@ -362,16 +362,16 @@
guint32 ogmrip_encoding_get_flags (OGMRipEncoding *encoding);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_id (OGMRipEncoding *encoding);
OGMDvdTitle * ogmrip_encoding_get_title (OGMRipEncoding *encoding);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_profile (OGMRipEncoding *encoding);
void ogmrip_encoding_set_profile (OGMRipEncoding *encoding,
const gchar *profile);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_label (OGMRipEncoding *encoding);
void ogmrip_encoding_set_label (OGMRipEncoding *encoding,
const gchar *label);
@@ -386,7 +386,7 @@
gint ogmrip_encoding_get_chapters_language (OGMRipEncoding *encoding);
void ogmrip_encoding_set_chapters_language (OGMRipEncoding *encoding,
guint language);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_chapter_label (OGMRipEncoding *encoding,
guint nr);
void ogmrip_encoding_set_chapter_label (OGMRipEncoding *encoding,
@@ -404,11 +404,11 @@
gboolean ogmrip_encoding_get_keep_tmp_files (OGMRipEncoding *encoding);
void ogmrip_encoding_set_keep_tmp_files (OGMRipEncoding *encoding,
gboolean keep_tmp_files);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_filename (OGMRipEncoding *encoding);
void ogmrip_encoding_set_filename (OGMRipEncoding *encoding,
const gchar *filename);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_logfile (OGMRipEncoding *encoding);
gint ogmrip_encoding_get_threads (OGMRipEncoding *encoding);
@@ -423,7 +423,7 @@
gboolean ogmrip_encoding_set_container_type (OGMRipEncoding *encoding,
GType type,
GError **error);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_fourcc (OGMRipEncoding *encoding);
void ogmrip_encoding_set_fourcc (OGMRipEncoding *encoding,
const gchar *fourcc);
Index: libogmrip/ogmrip-plugin.c
===================================================================
--- libogmrip/ogmrip-plugin.c (revision 2063)
+++ libogmrip/ogmrip-plugin.c (working copy)
@@ -367,7 +367,7 @@
return NULL;
}
-static G_CONST_RETURN gchar *
+static const gchar *
ogmrip_plugin_get_codec_name (GSList *list, GType type)
{
OGMRipPlugin *plugin;
@@ -542,7 +542,7 @@
*
* Returns: The name of the container, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_container_name (GType container)
{
OGMRipContainerPlugin *plugin;
@@ -740,7 +740,7 @@
*
* Returns: The name of the video codec, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_video_codec_name (GType codec)
{
g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_VIDEO_CODEC), NULL);
@@ -926,7 +926,7 @@
*
* Returns: The name of the audio codec, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_audio_codec_name (GType codec)
{
g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_AUDIO_CODEC), NULL);
@@ -1070,7 +1070,7 @@
*
* Returns: The name of the subtitle codec, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_subp_codec_name (GType codec)
{
g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_SUBP_CODEC), NULL);
Index: libogmrip/ogmrip-plugin.h
===================================================================
--- libogmrip/ogmrip-plugin.h (revision 2063)
+++ libogmrip/ogmrip-plugin.h (working copy)
@@ -196,7 +196,7 @@
GType ogmrip_plugin_get_nth_container (guint n);
GType ogmrip_plugin_get_container_by_name (const gchar *name);
gint ogmrip_plugin_get_container_index (GType container);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_container_name (GType container);
gboolean ogmrip_plugin_get_container_bframes (GType container);
gint ogmrip_plugin_get_container_max_audio (GType container);
@@ -216,7 +216,7 @@
GType ogmrip_plugin_get_nth_video_codec (guint n);
GType ogmrip_plugin_get_video_codec_by_name (const gchar *name);
gint ogmrip_plugin_get_video_codec_index (GType codec);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_video_codec_name (GType codec);
gint ogmrip_plugin_get_video_codec_format (GType codec);
gint ogmrip_plugin_get_video_codec_passes (GType codec);
@@ -236,7 +236,7 @@
GType ogmrip_plugin_get_nth_audio_codec (guint n);
GType ogmrip_plugin_get_audio_codec_by_name (const gchar *name);
gint ogmrip_plugin_get_audio_codec_index (GType codec);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_audio_codec_name (GType codec);
gint ogmrip_plugin_get_audio_codec_format (GType codec);
GModule * ogmrip_plugin_get_audio_codec_module (GType codec);
@@ -254,7 +254,7 @@
GType ogmrip_plugin_get_nth_subp_codec (guint n);
GType ogmrip_plugin_get_subp_codec_by_name (const gchar *name);
gint ogmrip_plugin_get_subp_codec_index (GType codec);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_subp_codec_name (GType codec);
gint ogmrip_plugin_get_subp_codec_format (GType codec);
gboolean ogmrip_plugin_get_subp_codec_text (GType codec);
Index: libogmrip/ogmrip-edl.c
===================================================================
--- libogmrip/ogmrip-edl.c (revision 2063)
+++ libogmrip/ogmrip-edl.c (working copy)
@@ -217,7 +217,7 @@
*
* Returns: The filename
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_edl_get_filename (OGMRipEdl *edl)
{
g_return_val_if_fail (edl != NULL, NULL);
Index: libogmrip/ogmrip-edl.h
===================================================================
--- libogmrip/ogmrip-edl.h (revision 2063)
+++ libogmrip/ogmrip-edl.h (working copy)
@@ -56,7 +56,7 @@
void ogmrip_edl_ref (OGMRipEdl *edl);
void ogmrip_edl_unref (OGMRipEdl *edl);
-G_CONST_RETURN
+const
gchar * ogmrip_edl_get_filename (OGMRipEdl *edl);
void ogmrip_edl_add (OGMRipEdl *edl,
Index: libogmrip/ogmrip-subp-codec.c
===================================================================
--- libogmrip/ogmrip-subp-codec.c (revision 2063)
+++ libogmrip/ogmrip-subp-codec.c (working copy)
@@ -347,7 +347,7 @@
*
* Returns: the track name
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_subp_codec_get_label (OGMRipSubpCodec *subp)
{
g_return_val_if_fail (OGMRIP_IS_SUBP_CODEC (subp), NULL);
Index: libogmrip/ogmrip-subp-codec.h
===================================================================
--- libogmrip/ogmrip-subp-codec.h (revision 2063)
+++ libogmrip/ogmrip-subp-codec.h (working copy)
@@ -62,7 +62,7 @@
gint ogmrip_subp_codec_get_newline (OGMRipSubpCodec *subp);
void ogmrip_subp_codec_set_label (OGMRipSubpCodec *subp,
const gchar *label);
-G_CONST_RETURN
+const
gchar * ogmrip_subp_codec_get_label (OGMRipSubpCodec *subp);
G_END_DECLS
Index: libogmrip/ogmrip-audio-codec.c
===================================================================
--- libogmrip/ogmrip-audio-codec.c (revision 2063)
+++ libogmrip/ogmrip-audio-codec.c (working copy)
@@ -465,7 +465,7 @@
*
* Returns: the track name
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_audio_codec_get_label (OGMRipAudioCodec *audio)
{
g_return_val_if_fail (OGMRIP_IS_AUDIO_CODEC (audio), NULL);
Index: libogmrip/ogmrip-audio-codec.h
===================================================================
--- libogmrip/ogmrip-audio-codec.h (revision 2063)
+++ libogmrip/ogmrip-audio-codec.h (working copy)
@@ -71,7 +71,7 @@
gint ogmrip_audio_codec_get_sample_rate (OGMRipAudioCodec *audio);
void ogmrip_audio_codec_set_label (OGMRipAudioCodec *audio,
const gchar *label);
-G_CONST_RETURN
+const
gchar * ogmrip_audio_codec_get_label (OGMRipAudioCodec *audio);
gint ogmrip_audio_codec_get_samples_per_frame (OGMRipAudioCodec *audio);
Index: libogmrip/ogmrip-container.c
===================================================================
--- libogmrip/ogmrip-container.c (revision 2063)
+++ libogmrip/ogmrip-container.c (working copy)
@@ -325,7 +325,7 @@
*
* Returns: The filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_container_get_output (OGMRipContainer *container)
{
g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL);
@@ -358,7 +358,7 @@
*
* Returns: The label, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_container_get_label (OGMRipContainer *container)
{
g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL);
@@ -390,7 +390,7 @@
*
* Returns: The FourCC, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_container_get_fourcc (OGMRipContainer *container)
{
g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL);
Index: libogmrip/ogmrip-container.h
===================================================================
--- libogmrip/ogmrip-container.h (revision 2063)
+++ libogmrip/ogmrip-container.h (working copy)
@@ -91,16 +91,16 @@
void ogmrip_container_set_options (OGMRipContainer *container,
const gchar *section);
-G_CONST_RETURN
+const
gchar * ogmrip_container_get_output (OGMRipContainer *container);
void ogmrip_container_set_output (OGMRipContainer *container,
const gchar *output);
-G_CONST_RETURN
+const
gchar * ogmrip_container_get_label (OGMRipContainer *container);
void ogmrip_container_set_label (OGMRipContainer *container,
const gchar *label);
-G_CONST_RETURN
+const
gchar * ogmrip_container_get_fourcc (OGMRipContainer *container);
void ogmrip_container_set_fourcc (OGMRipContainer *container,
const gchar *fourcc);
Index: libogmdvd/ogmdvd-labels.c
===================================================================
--- libogmdvd/ogmdvd-labels.c (revision 2063)
+++ libogmdvd/ogmdvd-labels.c (working copy)
@@ -248,7 +248,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_video_format_label (gint format)
{
static const gchar *video_format[] =
@@ -272,7 +272,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_display_aspect_label (gint aspect)
{
static gchar *display_aspect[] =
@@ -296,7 +296,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_format_label (gint format)
{
static gchar *audio_format[] =
@@ -324,7 +324,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_channels_label (gint channels)
{
static gchar *audio_channels[] =
@@ -352,7 +352,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_quantization_label (gint quantization)
{
static gchar *audio_quantization[] =
@@ -376,7 +376,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_content_label (gint content)
{
static gchar *audio_content[] =
@@ -401,7 +401,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_subp_content_label (gint content)
{
static gchar *subp_content[] =
@@ -437,7 +437,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_language_label (gint code)
{
const gchar *lang;
@@ -460,7 +460,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_language_iso639_1 (gint code)
{
static gchar lang[3];
@@ -489,7 +489,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_language_iso639_2 (gint code)
{
const gchar *lang;
Index: libogmdvd/ogmdvd-labels.h
===================================================================
--- libogmdvd/ogmdvd-labels.h (revision 2063)
+++ libogmdvd/ogmdvd-labels.h (working copy)
@@ -23,16 +23,16 @@
G_BEGIN_DECLS
-G_CONST_RETURN gchar * ogmdvd_get_video_format_label (gint format);
-G_CONST_RETURN gchar * ogmdvd_get_display_aspect_label (gint aspect);
-G_CONST_RETURN gchar * ogmdvd_get_audio_format_label (gint format);
-G_CONST_RETURN gchar * ogmdvd_get_audio_channels_label (gint channels);
-G_CONST_RETURN gchar * ogmdvd_get_audio_quantization_label (gint quantization);
-G_CONST_RETURN gchar * ogmdvd_get_audio_content_label (gint content);
-G_CONST_RETURN gchar * ogmdvd_get_subp_content_label (gint content);
-G_CONST_RETURN gchar * ogmdvd_get_language_label (gint code);
-G_CONST_RETURN gchar * ogmdvd_get_language_iso639_1 (gint code);
-G_CONST_RETURN gchar * ogmdvd_get_language_iso639_2 (gint code);
+const gchar * ogmdvd_get_video_format_label (gint format);
+const gchar * ogmdvd_get_display_aspect_label (gint aspect);
+const gchar * ogmdvd_get_audio_format_label (gint format);
+const gchar * ogmdvd_get_audio_channels_label (gint channels);
+const gchar * ogmdvd_get_audio_quantization_label (gint quantization);
+const gchar * ogmdvd_get_audio_content_label (gint content);
+const gchar * ogmdvd_get_subp_content_label (gint content);
+const gchar * ogmdvd_get_language_label (gint code);
+const gchar * ogmdvd_get_language_iso639_1 (gint code);
+const gchar * ogmdvd_get_language_iso639_2 (gint code);
G_END_DECLS
Index: libogmdvd/ogmdvd-title.c
===================================================================
--- libogmdvd/ogmdvd-title.c (revision 2063)
+++ libogmdvd/ogmdvd-title.c (working copy)
@@ -437,7 +437,7 @@
*
* Returns: a constant array of 16 integers, or NULL
*/
-G_CONST_RETURN guint *
+const guint *
ogmdvd_title_get_palette (OGMDvdTitle *title)
{
g_return_val_if_fail (title != NULL, NULL);
Index: libogmdvd/ogmdvd-disc.c
===================================================================
--- libogmdvd/ogmdvd-disc.c (revision 2063)
+++ libogmdvd/ogmdvd-disc.c (working copy)
@@ -134,7 +134,7 @@
return reader;
}
-static G_CONST_RETURN gchar *
+static const gchar *
dvd_reader_get_id (dvd_reader_t *reader)
{
static gchar str[33];
@@ -788,7 +788,7 @@
*
* Returns: The label of the DVD, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_disc_get_label (OGMDvdDisc *disc)
{
g_return_val_if_fail (disc != NULL, NULL);
@@ -804,7 +804,7 @@
*
* Returns: The identifier, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_disc_get_id (OGMDvdDisc *disc)
{
g_return_val_if_fail (disc != NULL, NULL);
@@ -820,7 +820,7 @@
*
* Returns: The device of the DVD.
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_disc_get_device (OGMDvdDisc *disc)
{
g_return_val_if_fail (disc != NULL, NULL);
Index: libogmdvd/ogmdvd-title.h
===================================================================
--- libogmdvd/ogmdvd-title.h (revision 2063)
+++ libogmdvd/ogmdvd-title.h (working copy)
@@ -54,7 +54,7 @@
void ogmdvd_title_get_aspect_ratio (OGMDvdTitle *title,
guint *numerator,
guint *denominator);
-G_CONST_RETURN
+const
guint * ogmdvd_title_get_palette (OGMDvdTitle *title);
gint ogmdvd_title_get_n_angles (OGMDvdTitle *title);
gint ogmdvd_title_get_n_chapters (OGMDvdTitle *title);
Index: libogmdvd/ogmdvd-disc.h
===================================================================
--- libogmdvd/ogmdvd-disc.h (revision 2063)
+++ libogmdvd/ogmdvd-disc.h (working copy)
@@ -67,11 +67,11 @@
void ogmdvd_disc_ref (OGMDvdDisc *disc);
void ogmdvd_disc_unref (OGMDvdDisc *disc);
-G_CONST_RETURN
+const
gchar * ogmdvd_disc_get_label (OGMDvdDisc *disc);
-G_CONST_RETURN
+const
gchar * ogmdvd_disc_get_id (OGMDvdDisc *disc);
-G_CONST_RETURN
+const
gchar * ogmdvd_disc_get_device (OGMDvdDisc *disc);
gint64 ogmdvd_disc_get_vmg_size (OGMDvdDisc *disc);
gint ogmdvd_disc_get_n_titles (OGMDvdDisc *disc);
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-15/ogmrip.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ogmrip.spec 22 Nov 2010 22:38:49 -0000 1.9
+++ ogmrip.spec 29 Jul 2011 15:39:09 -0000 1.10
@@ -1,6 +1,6 @@
Name: ogmrip
Version: 0.13.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: DVD ripping and encoding graphical user interface
Group: Applications/Multimedia
@@ -32,10 +32,17 @@
Requires(post): GConf2
Requires(postun): GConf2
-# These were patches were sent upstream in ogmrip-devel ML
+# These patches were sent upstream in ogmrip-devel ML
Patch0: ogmrip-0.13.6-gtk3_build_fix.patch
Patch1: ogmrip-0.13.6-libnotify07-compatibility.patch
+# Took from http://sourceforge.net/tracker/?func=detail&aid=3065523&group_id=75595&at...
+Patch2: ogmrip-0.13.6-audio-quality.patch
+
+# Upstream contacted:
+# http://sourceforge.net/mailarchive/forum.php?thread_name=CAP0i4rfD0MUX0hd...
+Patch3: ogmrip-0.13.6-g_const_return_deprecated.patch
+
%description
OGMRip is an application and a set of libraries for ripping and encoding DVDs
into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It relies
@@ -63,6 +70,8 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p0
+%patch3 -p0
%build
%configure \
@@ -110,7 +119,6 @@
%postun -p /sbin/ldconfig
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
@@ -139,6 +147,10 @@
%changelog
+* Tue Jul 26 2011 Gianluca Sforna <giallu(a)gmail.com> - 0.13.6-2
+- Fix build with newer GLib
+- Fix preferences bug with upstream patch
+
* Sun Nov 21 2010 Gianluca Sforna <giallu(a)gmail.com> - 0.13.6-1
- new upstream release
- Fix build with GTK3 and libnotify 0.7
12 years, 9 months
- 1
- 0
rpms/ogmrip/F-14 ogmrip-0.13.6-gtk3_build_fix.patch, NONE, 1.1 ogmrip-0.13.6-libnotify07-compatibility.patch, NONE, 1.1
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3201
Added Files:
ogmrip-0.13.6-gtk3_build_fix.patch
ogmrip-0.13.6-libnotify07-compatibility.patch
Log Message:
* Sun Nov 21 2010 Gianluca Sforna <giallu(a)gmail.com> - 0.13.6-1
- new upstream release
ogmrip-0.13.6-gtk3_build_fix.patch:
libogmrip-gtk/ogmrip-x264-options.c | 1 -
libogmrip-gtk/ogmrip-xvid-options.c | 1 -
src/ogmrip-pref-dialog.c | 1 -
src/ogmrip-profile-editor.c | 1 -
src/ogmrip-profiles-dialog.c | 1 -
src/ogmrip-progress-dialog.c | 1 -
src/ogmrip-queue-dialog.c | 1 -
src/ogmrip-update-dialog.c | 1 -
8 files changed, 8 deletions(-)
--- NEW FILE ogmrip-0.13.6-gtk3_build_fix.patch ---
diff -u -r ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-x264-options.c ogmrip-0.13.6/libogmrip-gtk/ogmrip-x264-options.c
--- ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-x264-options.c 2010-08-22 12:38:34.000000000 +0200
+++ ogmrip-0.13.6/libogmrip-gtk/ogmrip-x264-options.c 2010-11-22 19:30:10.484062522 +0100
@@ -246,7 +246,6 @@
NULL);
gtk_window_set_title (GTK_WINDOW (dialog), _("X264 Options"));
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_PREFERENCES);
diff -u -r ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-xvid-options.c ogmrip-0.13.6/libogmrip-gtk/ogmrip-xvid-options.c
--- ogmrip-0.13.6.orig/libogmrip-gtk/ogmrip-xvid-options.c 2010-08-22 12:38:34.000000000 +0200
+++ ogmrip-0.13.6/libogmrip-gtk/ogmrip-xvid-options.c 2010-11-22 19:30:17.687023102 +0100
@@ -165,7 +165,6 @@
return;
}
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), _("XviD Options"));
diff -u -r ogmrip-0.13.6.orig/src/ogmrip-pref-dialog.c ogmrip-0.13.6/src/ogmrip-pref-dialog.c
--- ogmrip-0.13.6.orig/src/ogmrip-pref-dialog.c 2010-08-22 12:38:28.000000000 +0200
+++ ogmrip-0.13.6/src/ogmrip-pref-dialog.c 2010-11-22 19:30:32.120944110 +0100
@@ -211,7 +211,6 @@
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
diff -u -r ogmrip-0.13.6.orig/src/ogmrip-profile-editor.c ogmrip-0.13.6/src/ogmrip-profile-editor.c
--- ogmrip-0.13.6.orig/src/ogmrip-profile-editor.c 2010-08-22 12:38:28.000000000 +0200
+++ ogmrip-0.13.6/src/ogmrip-profile-editor.c 2010-11-22 19:31:05.476761560 +0100
@@ -754,7 +754,6 @@
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_PREFERENCES);
diff -u -r ogmrip-0.13.6.orig/src/ogmrip-profiles-dialog.c ogmrip-0.13.6/src/ogmrip-profiles-dialog.c
--- ogmrip-0.13.6.orig/src/ogmrip-profiles-dialog.c 2010-08-22 12:38:28.000000000 +0200
+++ ogmrip-0.13.6/src/ogmrip-profiles-dialog.c 2010-11-22 19:30:39.920901421 +0100
@@ -667,7 +667,6 @@
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_window_set_default_size (GTK_WINDOW (dialog), 450, -1);
gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Profiles"));
diff -u -r ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c ogmrip-0.13.6/src/ogmrip-progress-dialog.c
--- ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c 2010-08-22 12:38:28.000000000 +0200
+++ ogmrip-0.13.6/src/ogmrip-progress-dialog.c 2010-11-22 19:31:42.223560450 +0100
@@ -404,7 +404,6 @@
gtk_window_set_default_size (GTK_WINDOW (dialog), 450, -1);
gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_EXECUTE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
diff -u -r ogmrip-0.13.6.orig/src/ogmrip-queue-dialog.c ogmrip-0.13.6/src/ogmrip-queue-dialog.c
--- ogmrip-0.13.6.orig/src/ogmrip-queue-dialog.c 2010-08-22 12:38:28.000000000 +0200
+++ ogmrip-0.13.6/src/ogmrip-queue-dialog.c 2010-11-22 19:30:50.742842196 +0100
@@ -611,7 +611,6 @@
gtk_window_set_title (GTK_WINDOW (dialog), _("Encoding Queue"));
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE);
gtk_window_set_icon_from_stock (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);
diff -u -r ogmrip-0.13.6.orig/src/ogmrip-update-dialog.c ogmrip-0.13.6/src/ogmrip-update-dialog.c
--- ogmrip-0.13.6.orig/src/ogmrip-update-dialog.c 2010-08-22 12:38:28.000000000 +0200
+++ ogmrip-0.13.6/src/ogmrip-update-dialog.c 2010-11-22 19:31:14.786710608 +0100
@@ -130,7 +130,6 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
NULL);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_window_set_default_size (GTK_WINDOW (dialog), 450, 350);
gtk_window_set_title (GTK_WINDOW (dialog), _("Update profiles"));
ogmrip-0.13.6-libnotify07-compatibility.patch:
README | 2 +-
configure.in | 2 +-
src/.ogmrip-progress-dialog.c.swp |only
src/ogmrip-progress-dialog.c | 3 +--
4 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE ogmrip-0.13.6-libnotify07-compatibility.patch ---
diff -u -r ogmrip-0.13.6.orig/configure.in ogmrip-0.13.6/configure.in
--- ogmrip-0.13.6.orig/configure.in 2010-08-22 16:55:37.000000000 +0200
+++ ogmrip-0.13.6/configure.in 2010-11-22 22:20:01.841724409 +0100
@@ -386,7 +386,7 @@
dnl **************************************************************
-LIBNOTIFY_REQUIRED=0.4.3
+LIBNOTIFY_REQUIRED=0.7.0
LIBNOTIFY_MODULES="libnotify >= $LIBNOTIFY_REQUIRED"
diff -u -r ogmrip-0.13.6.orig/README ogmrip-0.13.6/README
--- ogmrip-0.13.6.orig/README 2010-08-22 12:38:34.000000000 +0200
+++ ogmrip-0.13.6/README 2010-11-22 22:20:19.409629410 +0100
@@ -48,7 +48,7 @@
For notification support:
- libnotify >= 0.4.3: http://www.galago-project.org
+ libnotify >= 0.7.0: http://www.galago-project.org
For Ogg Media support:
diff -u -r ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c ogmrip-0.13.6/src/ogmrip-progress-dialog.c
--- ogmrip-0.13.6.orig/src/ogmrip-progress-dialog.c 2010-08-22 12:38:28.000000000 +0200
+++ ogmrip-0.13.6/src/ogmrip-progress-dialog.c 2010-11-22 22:15:18.804253123 +0100
@@ -418,8 +418,7 @@
g_signal_connect_swapped (dialog->priv->status_icon, "popup_menu",
G_CALLBACK (ogmrip_progress_dialog_status_icon_popup_menu), dialog);
- dialog->priv->notification = notify_notification_new_with_status_icon ("Dummy", "Dummy",
- OGMRIP_DATA_DIR G_DIR_SEPARATOR_S OGMRIP_ICON_FILE, dialog->priv->status_icon);
+ dialog->priv->notification = notify_notification_new ("Dummy", "Dummy", NULL);
g_signal_connect (dialog, "window-state-event",
G_CALLBACK (ogmrip_progress_dialog_state_changed), NULL);
Only in ogmrip-0.13.6/src: .ogmrip-progress-dialog.c.swp
12 years, 9 months
- 1
- 0
rpms/ogmrip/F-14 ogmrip-0.13.6-audio-quality.patch, NONE, 1.1 ogmrip-0.13.6-g_const_return_deprecated.patch, NONE, 1.1 ogmrip.spec, 1.9, 1.10
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2102
Modified Files:
ogmrip.spec
Added Files:
ogmrip-0.13.6-audio-quality.patch
ogmrip-0.13.6-g_const_return_deprecated.patch
Log Message:
* Sun Nov 21 2010 Gianluca Sforna <giallu(a)gmail.com> - 0.13.6-1
- new upstream release
ogmrip-0.13.6-audio-quality.patch:
ogmrip-profile-editor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE ogmrip-0.13.6-audio-quality.patch ---
Index: src/ogmrip-profile-editor.c
===================================================================
--- src/ogmrip-profile-editor.c (révision 2035)
+++ src/ogmrip-profile-editor.c (copie de travail)
@@ -951,7 +951,7 @@
dialog->priv->audio_quality_label = glade_xml_get_widget (xml, "audio-quality-label");
dialog->priv->audio_quality_spin = glade_xml_get_widget (xml, "audio-quality-spin");
ogmrip_settings_bind (settings, dialog->priv->profile_section,
- OGMRIP_GCONF_AUDIO_QUALITY, G_OBJECT (widget), "value");
+ OGMRIP_GCONF_AUDIO_QUALITY, G_OBJECT (dialog->priv->audio_quality_spin), "value");
widget = glade_xml_get_widget (xml, "normalize-check");
ogmrip_settings_bind (settings, dialog->priv->profile_section,
ogmrip-0.13.6-g_const_return_deprecated.patch:
libogmdvd/ogmdvd-disc.c | 8 ++++----
libogmdvd/ogmdvd-disc.h | 6 +++---
libogmdvd/ogmdvd-labels.c | 20 ++++++++++----------
libogmdvd/ogmdvd-labels.h | 20 ++++++++++----------
libogmdvd/ogmdvd-title.c | 2 +-
libogmdvd/ogmdvd-title.h | 2 +-
libogmrip/ogmrip-audio-codec.c | 2 +-
libogmrip/ogmrip-audio-codec.h | 2 +-
libogmrip/ogmrip-chapters.c | 2 +-
libogmrip/ogmrip-chapters.h | 2 +-
libogmrip/ogmrip-codec.c | 2 +-
libogmrip/ogmrip-codec.h | 2 +-
libogmrip/ogmrip-container.c | 6 +++---
libogmrip/ogmrip-container.h | 6 +++---
libogmrip/ogmrip-edl.c | 2 +-
libogmrip/ogmrip-edl.h | 2 +-
libogmrip/ogmrip-encoding.c | 16 ++++++++--------
libogmrip/ogmrip-encoding.h | 14 +++++++-------
libogmrip/ogmrip-fs.c | 4 ++--
libogmrip/ogmrip-fs.h | 4 ++--
libogmrip/ogmrip-lavc.c | 2 +-
libogmrip/ogmrip-lavc.h | 2 +-
libogmrip/ogmrip-plugin.c | 10 +++++-----
libogmrip/ogmrip-plugin.h | 8 ++++----
libogmrip/ogmrip-subp-codec.c | 2 +-
libogmrip/ogmrip-subp-codec.h | 2 +-
26 files changed, 75 insertions(+), 75 deletions(-)
--- NEW FILE ogmrip-0.13.6-g_const_return_deprecated.patch ---
Index: libogmrip/ogmrip-fs.c
===================================================================
--- libogmrip/ogmrip-fs.c (revision 2063)
+++ libogmrip/ogmrip-fs.c (working copy)
@@ -51,7 +51,7 @@
*
* Returns: The temporaty directory
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_fs_get_tmp_dir (void)
{
if (!ogmrip_tmp_dir)
@@ -618,7 +618,7 @@
*
* Returns: The extension, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_fs_get_extension (const gchar *filename)
{
gchar *dot;
Index: libogmrip/ogmrip-chapters.c
===================================================================
--- libogmrip/ogmrip-chapters.c (revision 2063)
+++ libogmrip/ogmrip-chapters.c (working copy)
@@ -205,7 +205,7 @@
*
* Returns: The label
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_chapters_get_label (OGMRipChapters *chapters, guint n)
{
g_return_val_if_fail (OGMRIP_IS_CHAPTERS (chapters), NULL);
Index: libogmrip/ogmrip-fs.h
===================================================================
--- libogmrip/ogmrip-fs.h (revision 2063)
+++ libogmrip/ogmrip-fs.h (working copy)
@@ -30,7 +30,7 @@
#define g_chdir chdir
#endif
-G_CONST_RETURN
+const
gchar * ogmrip_fs_get_tmp_dir (void);
void ogmrip_fs_set_tmp_dir (const gchar *dir);
@@ -71,7 +71,7 @@
gchar * ogmrip_fs_get_full_path (const gchar *filename);
-G_CONST_RETURN
+const
gchar * ogmrip_fs_get_extension (const gchar *filename);
gchar * ogmrip_fs_set_extension (const gchar *filename,
const gchar *extension);
Index: libogmrip/ogmrip-codec.c
===================================================================
--- libogmrip/ogmrip-codec.c (revision 2063)
+++ libogmrip/ogmrip-codec.c (working copy)
@@ -294,7 +294,7 @@
*
* Returns: the filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_codec_get_output (OGMRipCodec *codec)
{
g_return_val_if_fail (OGMRIP_IS_CODEC (codec), NULL);
Index: libogmrip/ogmrip-chapters.h
===================================================================
--- libogmrip/ogmrip-chapters.h (revision 2063)
+++ libogmrip/ogmrip-chapters.h (working copy)
@@ -48,7 +48,7 @@
GType ogmrip_chapters_get_type (void);
OGMJobSpawn * ogmrip_chapters_new (OGMDvdTitle *title,
const gchar *output);
-G_CONST_RETURN
+const
gchar * ogmrip_chapters_get_label (OGMRipChapters *chapters,
guint n);
void ogmrip_chapters_set_label (OGMRipChapters *chapters,
Index: libogmrip/ogmrip-codec.h
===================================================================
--- libogmrip/ogmrip-codec.h (revision 2063)
+++ libogmrip/ogmrip-codec.h (working copy)
@@ -53,7 +53,7 @@
};
GType ogmrip_codec_get_type (void);
-G_CONST_RETURN
+const
gchar * ogmrip_codec_get_output (OGMRipCodec *codec);
void ogmrip_codec_set_output (OGMRipCodec *codec,
const gchar *output);
Index: libogmrip/ogmrip-lavc.c
===================================================================
--- libogmrip/ogmrip-lavc.c (revision 2063)
+++ libogmrip/ogmrip-lavc.c (working copy)
@@ -135,7 +135,7 @@
return CLAMP (quantizer, 2, 31);
}
-static G_CONST_RETURN gchar *
+static const gchar *
ogmrip_lavc_get_codec (OGMRipLavc *lavc)
{
OGMRipLavcClass *klass;
Index: libogmrip/ogmrip-lavc.h
===================================================================
--- libogmrip/ogmrip-lavc.h (revision 2063)
+++ libogmrip/ogmrip-lavc.h (working copy)
@@ -69,7 +69,7 @@
OGMRipVideoCodecClass parent_class;
/* vtable */
- G_CONST_RETURN gchar * (* get_codec) (void);
+ const gchar * (* get_codec) (void);
};
/**
Index: libogmrip/ogmrip-encoding.c
===================================================================
--- libogmrip/ogmrip-encoding.c (revision 2063)
+++ libogmrip/ogmrip-encoding.c (working copy)
@@ -359,7 +359,7 @@
return data1->nr - data2->nr;
}
-static G_CONST_RETURN gchar *
+static const gchar *
ogmrip_encoding_get_device (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3550,7 +3550,7 @@
*
* Returns: The id, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_id (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3582,7 +3582,7 @@
*
* Returns: The profile' section, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_profile (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3622,7 +3622,7 @@
*
* Returns: The name of the encoding, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_label (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3669,7 +3669,7 @@
*
* Returns: The name of the chapter, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_chapter_label (OGMRipEncoding *encoding, guint nr)
{
OGMRipChapterData *data;
@@ -3829,7 +3829,7 @@
*
* Returns: The output filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_filename (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3868,7 +3868,7 @@
*
* Returns: The log filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_logfile (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -4007,7 +4007,7 @@
*
* Returns: The FourCC, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_fourcc (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
Index: libogmrip/ogmrip-encoding.h
===================================================================
--- libogmrip/ogmrip-encoding.h (revision 2063)
+++ libogmrip/ogmrip-encoding.h (working copy)
@@ -362,16 +362,16 @@
guint32 ogmrip_encoding_get_flags (OGMRipEncoding *encoding);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_id (OGMRipEncoding *encoding);
OGMDvdTitle * ogmrip_encoding_get_title (OGMRipEncoding *encoding);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_profile (OGMRipEncoding *encoding);
void ogmrip_encoding_set_profile (OGMRipEncoding *encoding,
const gchar *profile);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_label (OGMRipEncoding *encoding);
void ogmrip_encoding_set_label (OGMRipEncoding *encoding,
const gchar *label);
@@ -386,7 +386,7 @@
gint ogmrip_encoding_get_chapters_language (OGMRipEncoding *encoding);
void ogmrip_encoding_set_chapters_language (OGMRipEncoding *encoding,
guint language);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_chapter_label (OGMRipEncoding *encoding,
guint nr);
void ogmrip_encoding_set_chapter_label (OGMRipEncoding *encoding,
@@ -404,11 +404,11 @@
gboolean ogmrip_encoding_get_keep_tmp_files (OGMRipEncoding *encoding);
void ogmrip_encoding_set_keep_tmp_files (OGMRipEncoding *encoding,
gboolean keep_tmp_files);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_filename (OGMRipEncoding *encoding);
void ogmrip_encoding_set_filename (OGMRipEncoding *encoding,
const gchar *filename);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_logfile (OGMRipEncoding *encoding);
gint ogmrip_encoding_get_threads (OGMRipEncoding *encoding);
@@ -423,7 +423,7 @@
gboolean ogmrip_encoding_set_container_type (OGMRipEncoding *encoding,
GType type,
GError **error);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_fourcc (OGMRipEncoding *encoding);
void ogmrip_encoding_set_fourcc (OGMRipEncoding *encoding,
const gchar *fourcc);
Index: libogmrip/ogmrip-plugin.c
===================================================================
--- libogmrip/ogmrip-plugin.c (revision 2063)
+++ libogmrip/ogmrip-plugin.c (working copy)
@@ -367,7 +367,7 @@
return NULL;
}
-static G_CONST_RETURN gchar *
+static const gchar *
ogmrip_plugin_get_codec_name (GSList *list, GType type)
{
OGMRipPlugin *plugin;
@@ -542,7 +542,7 @@
*
* Returns: The name of the container, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_container_name (GType container)
{
OGMRipContainerPlugin *plugin;
@@ -740,7 +740,7 @@
*
* Returns: The name of the video codec, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_video_codec_name (GType codec)
{
g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_VIDEO_CODEC), NULL);
@@ -926,7 +926,7 @@
*
* Returns: The name of the audio codec, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_audio_codec_name (GType codec)
{
g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_AUDIO_CODEC), NULL);
@@ -1070,7 +1070,7 @@
*
* Returns: The name of the subtitle codec, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_subp_codec_name (GType codec)
{
g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_SUBP_CODEC), NULL);
Index: libogmrip/ogmrip-plugin.h
===================================================================
--- libogmrip/ogmrip-plugin.h (revision 2063)
+++ libogmrip/ogmrip-plugin.h (working copy)
@@ -196,7 +196,7 @@
GType ogmrip_plugin_get_nth_container (guint n);
GType ogmrip_plugin_get_container_by_name (const gchar *name);
gint ogmrip_plugin_get_container_index (GType container);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_container_name (GType container);
gboolean ogmrip_plugin_get_container_bframes (GType container);
gint ogmrip_plugin_get_container_max_audio (GType container);
@@ -216,7 +216,7 @@
GType ogmrip_plugin_get_nth_video_codec (guint n);
GType ogmrip_plugin_get_video_codec_by_name (const gchar *name);
gint ogmrip_plugin_get_video_codec_index (GType codec);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_video_codec_name (GType codec);
gint ogmrip_plugin_get_video_codec_format (GType codec);
gint ogmrip_plugin_get_video_codec_passes (GType codec);
@@ -236,7 +236,7 @@
GType ogmrip_plugin_get_nth_audio_codec (guint n);
GType ogmrip_plugin_get_audio_codec_by_name (const gchar *name);
gint ogmrip_plugin_get_audio_codec_index (GType codec);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_audio_codec_name (GType codec);
gint ogmrip_plugin_get_audio_codec_format (GType codec);
GModule * ogmrip_plugin_get_audio_codec_module (GType codec);
@@ -254,7 +254,7 @@
GType ogmrip_plugin_get_nth_subp_codec (guint n);
GType ogmrip_plugin_get_subp_codec_by_name (const gchar *name);
gint ogmrip_plugin_get_subp_codec_index (GType codec);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_subp_codec_name (GType codec);
gint ogmrip_plugin_get_subp_codec_format (GType codec);
gboolean ogmrip_plugin_get_subp_codec_text (GType codec);
Index: libogmrip/ogmrip-edl.c
===================================================================
--- libogmrip/ogmrip-edl.c (revision 2063)
+++ libogmrip/ogmrip-edl.c (working copy)
@@ -217,7 +217,7 @@
*
* Returns: The filename
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_edl_get_filename (OGMRipEdl *edl)
{
g_return_val_if_fail (edl != NULL, NULL);
Index: libogmrip/ogmrip-edl.h
===================================================================
--- libogmrip/ogmrip-edl.h (revision 2063)
+++ libogmrip/ogmrip-edl.h (working copy)
@@ -56,7 +56,7 @@
void ogmrip_edl_ref (OGMRipEdl *edl);
void ogmrip_edl_unref (OGMRipEdl *edl);
-G_CONST_RETURN
+const
gchar * ogmrip_edl_get_filename (OGMRipEdl *edl);
void ogmrip_edl_add (OGMRipEdl *edl,
Index: libogmrip/ogmrip-subp-codec.c
===================================================================
--- libogmrip/ogmrip-subp-codec.c (revision 2063)
+++ libogmrip/ogmrip-subp-codec.c (working copy)
@@ -347,7 +347,7 @@
*
* Returns: the track name
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_subp_codec_get_label (OGMRipSubpCodec *subp)
{
g_return_val_if_fail (OGMRIP_IS_SUBP_CODEC (subp), NULL);
Index: libogmrip/ogmrip-subp-codec.h
===================================================================
--- libogmrip/ogmrip-subp-codec.h (revision 2063)
+++ libogmrip/ogmrip-subp-codec.h (working copy)
@@ -62,7 +62,7 @@
gint ogmrip_subp_codec_get_newline (OGMRipSubpCodec *subp);
void ogmrip_subp_codec_set_label (OGMRipSubpCodec *subp,
const gchar *label);
-G_CONST_RETURN
+const
gchar * ogmrip_subp_codec_get_label (OGMRipSubpCodec *subp);
G_END_DECLS
Index: libogmrip/ogmrip-audio-codec.c
===================================================================
--- libogmrip/ogmrip-audio-codec.c (revision 2063)
+++ libogmrip/ogmrip-audio-codec.c (working copy)
@@ -465,7 +465,7 @@
*
* Returns: the track name
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_audio_codec_get_label (OGMRipAudioCodec *audio)
{
g_return_val_if_fail (OGMRIP_IS_AUDIO_CODEC (audio), NULL);
Index: libogmrip/ogmrip-audio-codec.h
===================================================================
--- libogmrip/ogmrip-audio-codec.h (revision 2063)
+++ libogmrip/ogmrip-audio-codec.h (working copy)
@@ -71,7 +71,7 @@
gint ogmrip_audio_codec_get_sample_rate (OGMRipAudioCodec *audio);
void ogmrip_audio_codec_set_label (OGMRipAudioCodec *audio,
const gchar *label);
-G_CONST_RETURN
+const
gchar * ogmrip_audio_codec_get_label (OGMRipAudioCodec *audio);
gint ogmrip_audio_codec_get_samples_per_frame (OGMRipAudioCodec *audio);
Index: libogmrip/ogmrip-container.c
===================================================================
--- libogmrip/ogmrip-container.c (revision 2063)
+++ libogmrip/ogmrip-container.c (working copy)
@@ -325,7 +325,7 @@
*
* Returns: The filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_container_get_output (OGMRipContainer *container)
{
g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL);
@@ -358,7 +358,7 @@
*
* Returns: The label, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_container_get_label (OGMRipContainer *container)
{
g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL);
@@ -390,7 +390,7 @@
*
* Returns: The FourCC, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_container_get_fourcc (OGMRipContainer *container)
{
g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL);
Index: libogmrip/ogmrip-container.h
===================================================================
--- libogmrip/ogmrip-container.h (revision 2063)
+++ libogmrip/ogmrip-container.h (working copy)
@@ -91,16 +91,16 @@
void ogmrip_container_set_options (OGMRipContainer *container,
const gchar *section);
-G_CONST_RETURN
+const
gchar * ogmrip_container_get_output (OGMRipContainer *container);
void ogmrip_container_set_output (OGMRipContainer *container,
const gchar *output);
-G_CONST_RETURN
+const
gchar * ogmrip_container_get_label (OGMRipContainer *container);
void ogmrip_container_set_label (OGMRipContainer *container,
const gchar *label);
-G_CONST_RETURN
+const
gchar * ogmrip_container_get_fourcc (OGMRipContainer *container);
void ogmrip_container_set_fourcc (OGMRipContainer *container,
const gchar *fourcc);
Index: libogmdvd/ogmdvd-labels.c
===================================================================
--- libogmdvd/ogmdvd-labels.c (revision 2063)
+++ libogmdvd/ogmdvd-labels.c (working copy)
@@ -248,7 +248,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_video_format_label (gint format)
{
static const gchar *video_format[] =
@@ -272,7 +272,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_display_aspect_label (gint aspect)
{
static gchar *display_aspect[] =
@@ -296,7 +296,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_format_label (gint format)
{
static gchar *audio_format[] =
@@ -324,7 +324,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_channels_label (gint channels)
{
static gchar *audio_channels[] =
@@ -352,7 +352,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_quantization_label (gint quantization)
{
static gchar *audio_quantization[] =
@@ -376,7 +376,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_content_label (gint content)
{
static gchar *audio_content[] =
@@ -401,7 +401,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_subp_content_label (gint content)
{
static gchar *subp_content[] =
@@ -437,7 +437,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_language_label (gint code)
{
const gchar *lang;
@@ -460,7 +460,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_language_iso639_1 (gint code)
{
static gchar lang[3];
@@ -489,7 +489,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_language_iso639_2 (gint code)
{
const gchar *lang;
Index: libogmdvd/ogmdvd-labels.h
===================================================================
--- libogmdvd/ogmdvd-labels.h (revision 2063)
+++ libogmdvd/ogmdvd-labels.h (working copy)
@@ -23,16 +23,16 @@
G_BEGIN_DECLS
-G_CONST_RETURN gchar * ogmdvd_get_video_format_label (gint format);
-G_CONST_RETURN gchar * ogmdvd_get_display_aspect_label (gint aspect);
-G_CONST_RETURN gchar * ogmdvd_get_audio_format_label (gint format);
-G_CONST_RETURN gchar * ogmdvd_get_audio_channels_label (gint channels);
-G_CONST_RETURN gchar * ogmdvd_get_audio_quantization_label (gint quantization);
-G_CONST_RETURN gchar * ogmdvd_get_audio_content_label (gint content);
-G_CONST_RETURN gchar * ogmdvd_get_subp_content_label (gint content);
-G_CONST_RETURN gchar * ogmdvd_get_language_label (gint code);
-G_CONST_RETURN gchar * ogmdvd_get_language_iso639_1 (gint code);
-G_CONST_RETURN gchar * ogmdvd_get_language_iso639_2 (gint code);
+const gchar * ogmdvd_get_video_format_label (gint format);
+const gchar * ogmdvd_get_display_aspect_label (gint aspect);
+const gchar * ogmdvd_get_audio_format_label (gint format);
+const gchar * ogmdvd_get_audio_channels_label (gint channels);
+const gchar * ogmdvd_get_audio_quantization_label (gint quantization);
+const gchar * ogmdvd_get_audio_content_label (gint content);
+const gchar * ogmdvd_get_subp_content_label (gint content);
+const gchar * ogmdvd_get_language_label (gint code);
+const gchar * ogmdvd_get_language_iso639_1 (gint code);
+const gchar * ogmdvd_get_language_iso639_2 (gint code);
G_END_DECLS
Index: libogmdvd/ogmdvd-title.c
===================================================================
--- libogmdvd/ogmdvd-title.c (revision 2063)
+++ libogmdvd/ogmdvd-title.c (working copy)
@@ -437,7 +437,7 @@
*
* Returns: a constant array of 16 integers, or NULL
*/
-G_CONST_RETURN guint *
+const guint *
ogmdvd_title_get_palette (OGMDvdTitle *title)
{
g_return_val_if_fail (title != NULL, NULL);
Index: libogmdvd/ogmdvd-disc.c
===================================================================
--- libogmdvd/ogmdvd-disc.c (revision 2063)
+++ libogmdvd/ogmdvd-disc.c (working copy)
@@ -134,7 +134,7 @@
return reader;
}
-static G_CONST_RETURN gchar *
+static const gchar *
dvd_reader_get_id (dvd_reader_t *reader)
{
static gchar str[33];
@@ -788,7 +788,7 @@
*
* Returns: The label of the DVD, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_disc_get_label (OGMDvdDisc *disc)
{
g_return_val_if_fail (disc != NULL, NULL);
@@ -804,7 +804,7 @@
*
* Returns: The identifier, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_disc_get_id (OGMDvdDisc *disc)
{
g_return_val_if_fail (disc != NULL, NULL);
@@ -820,7 +820,7 @@
*
* Returns: The device of the DVD.
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_disc_get_device (OGMDvdDisc *disc)
{
g_return_val_if_fail (disc != NULL, NULL);
Index: libogmdvd/ogmdvd-title.h
===================================================================
--- libogmdvd/ogmdvd-title.h (revision 2063)
+++ libogmdvd/ogmdvd-title.h (working copy)
@@ -54,7 +54,7 @@
void ogmdvd_title_get_aspect_ratio (OGMDvdTitle *title,
guint *numerator,
guint *denominator);
-G_CONST_RETURN
+const
guint * ogmdvd_title_get_palette (OGMDvdTitle *title);
gint ogmdvd_title_get_n_angles (OGMDvdTitle *title);
gint ogmdvd_title_get_n_chapters (OGMDvdTitle *title);
Index: libogmdvd/ogmdvd-disc.h
===================================================================
--- libogmdvd/ogmdvd-disc.h (revision 2063)
+++ libogmdvd/ogmdvd-disc.h (working copy)
@@ -67,11 +67,11 @@
void ogmdvd_disc_ref (OGMDvdDisc *disc);
void ogmdvd_disc_unref (OGMDvdDisc *disc);
-G_CONST_RETURN
+const
gchar * ogmdvd_disc_get_label (OGMDvdDisc *disc);
-G_CONST_RETURN
+const
gchar * ogmdvd_disc_get_id (OGMDvdDisc *disc);
-G_CONST_RETURN
+const
gchar * ogmdvd_disc_get_device (OGMDvdDisc *disc);
gint64 ogmdvd_disc_get_vmg_size (OGMDvdDisc *disc);
gint ogmdvd_disc_get_n_titles (OGMDvdDisc *disc);
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-14/ogmrip.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ogmrip.spec 22 Nov 2010 22:40:19 -0000 1.9
+++ ogmrip.spec 29 Jul 2011 10:28:09 -0000 1.10
@@ -1,6 +1,6 @@
Name: ogmrip
Version: 0.13.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: DVD ripping and encoding graphical user interface
Group: Applications/Multimedia
@@ -32,6 +32,17 @@
Requires(post): GConf2
Requires(postun): GConf2
+# These patches were sent upstream in ogmrip-devel ML
+Patch0: ogmrip-0.13.6-gtk3_build_fix.patch
+Patch1: ogmrip-0.13.6-libnotify07-compatibility.patch
+
+# Took from http://sourceforge.net/tracker/?func=detail&aid=3065523&group_id=75595&at...
+Patch2: ogmrip-0.13.6-audio-quality.patch
+
+# Upstream contacted:
+# http://sourceforge.net/mailarchive/forum.php?thread_name=CAP0i4rfD0MUX0hd...
+Patch3: ogmrip-0.13.6-g_const_return_deprecated.patch
+
%description
OGMRip is an application and a set of libraries for ripping and encoding DVDs
into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It relies
@@ -57,6 +68,10 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
+%patch3 -p0
%build
%configure \
@@ -104,7 +119,6 @@
%postun -p /sbin/ldconfig
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
@@ -133,8 +147,13 @@
%changelog
+* Tue Jul 26 2011 Gianluca Sforna <giallu(a)gmail.com> - 0.13.6-2
+- Fix build with newer GLib
+- Fix preferences bug with upstream patch
+
* Sun Nov 21 2010 Gianluca Sforna <giallu(a)gmail.com> - 0.13.6-1
- new upstream release
+- Fix build with GTK3 and libnotify 0.7
* Fri May 22 2010 Gianluca Sforna <giallu gmail com> - 0.13.5-1
- new upstream release
12 years, 9 months
- 1
- 0
rpms/mpg321/devel .cvsignore, 1.4, 1.5 mpg321.spec, 1.10, 1.11 sources, 1.4, 1.5
by Matthias Saou
Author: thias
Update of /cvs/free/rpms/mpg321/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24868
Modified Files:
.cvsignore mpg321.spec sources
Log Message:
Update to 0.2.13-2.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpg321/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 5 Jan 2011 19:04:06 -0000 1.4
+++ .cvsignore 28 Jul 2011 11:31:32 -0000 1.5
@@ -1 +1 @@
-mpg321-0.2.12-1.tar.gz
+mpg321-0.2.13-2.tar.gz
Index: mpg321.spec
===================================================================
RCS file: /cvs/free/rpms/mpg321/devel/mpg321.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mpg321.spec 5 Jan 2011 19:13:42 -0000 1.10
+++ mpg321.spec 28 Jul 2011 11:31:32 -0000 1.11
@@ -1,11 +1,11 @@
Name: mpg321
-Version: 0.2.12
+Version: 0.2.13
Release: 2%{?dist}
Summary: Command line MPEG audio player (fixed-point calculations)
Group: Applications/Multimedia
License: GPLv2+
URL: http://mpg321.sourceforge.net/
-Source0: http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}-1.tar.gz
+Source0: http://downloads.sf.net/sourceforge/%{name}/%{name}-%{version}-2.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libao-devel
BuildRequires: libmad-devel
@@ -31,7 +31,7 @@
fast as mpg123 on systems which have a floating point unit.
%prep
-%setup -q -n %{name}-%{version}-1
+%setup -q -n %{name}-%{version}-2
%build
%configure \
@@ -82,8 +82,11 @@
%ghost %{_mandir}/man1/mpg123.1*
%changelog
+* Thu Jul 28 2011 Matthias Saou <matthias(a)saou.eu> 0.2.13-2
+- Update to 0.2.13-2.
+
* Wed Jan 05 2011 Adrian Reber <adrian(a)lisas.de> - 0.2.12-2
-- updated to 0.12.12 (#1582)
+- updated to 0.2.12 (#1582)
* Wed Sep 29 2010 Adrian Reber <adrian(a)lisas.de> - 0.2.10.6-3
- rebuilt for #1399 (not possible to install mpg321)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpg321/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 5 Jan 2011 19:04:06 -0000 1.4
+++ sources 28 Jul 2011 11:31:32 -0000 1.5
@@ -1 +1 @@
-abd1e2ea6a606389ff19da66d252e530 mpg321-0.2.12-1.tar.gz
+1398ef00439a94bebd4342e98b30c3a3 mpg321-0.2.13-2.tar.gz
12 years, 9 months
- 1
- 0
rpms/ogmrip/devel ogmrip-0.13.6-audio-quality.patch, NONE, 1.1 ogmrip-0.13.6-g_const_return_deprecated.patch, NONE, 1.1 ogmrip.spec, 1.9, 1.10
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13736
Modified Files:
ogmrip.spec
Added Files:
ogmrip-0.13.6-audio-quality.patch
ogmrip-0.13.6-g_const_return_deprecated.patch
Log Message:
Fix build in raawhide, add upstream patch for preferences bug
ogmrip-0.13.6-audio-quality.patch:
ogmrip-profile-editor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE ogmrip-0.13.6-audio-quality.patch ---
Index: src/ogmrip-profile-editor.c
===================================================================
--- src/ogmrip-profile-editor.c (révision 2035)
+++ src/ogmrip-profile-editor.c (copie de travail)
@@ -951,7 +951,7 @@
dialog->priv->audio_quality_label = glade_xml_get_widget (xml, "audio-quality-label");
dialog->priv->audio_quality_spin = glade_xml_get_widget (xml, "audio-quality-spin");
ogmrip_settings_bind (settings, dialog->priv->profile_section,
- OGMRIP_GCONF_AUDIO_QUALITY, G_OBJECT (widget), "value");
+ OGMRIP_GCONF_AUDIO_QUALITY, G_OBJECT (dialog->priv->audio_quality_spin), "value");
widget = glade_xml_get_widget (xml, "normalize-check");
ogmrip_settings_bind (settings, dialog->priv->profile_section,
ogmrip-0.13.6-g_const_return_deprecated.patch:
libogmdvd/ogmdvd-disc.c | 8 ++++----
libogmdvd/ogmdvd-disc.h | 6 +++---
libogmdvd/ogmdvd-labels.c | 20 ++++++++++----------
libogmdvd/ogmdvd-labels.h | 20 ++++++++++----------
libogmdvd/ogmdvd-title.c | 2 +-
libogmdvd/ogmdvd-title.h | 2 +-
libogmrip/ogmrip-audio-codec.c | 2 +-
libogmrip/ogmrip-audio-codec.h | 2 +-
libogmrip/ogmrip-chapters.c | 2 +-
libogmrip/ogmrip-chapters.h | 2 +-
libogmrip/ogmrip-codec.c | 2 +-
libogmrip/ogmrip-codec.h | 2 +-
libogmrip/ogmrip-container.c | 6 +++---
libogmrip/ogmrip-container.h | 6 +++---
libogmrip/ogmrip-edl.c | 2 +-
libogmrip/ogmrip-edl.h | 2 +-
libogmrip/ogmrip-encoding.c | 16 ++++++++--------
libogmrip/ogmrip-encoding.h | 14 +++++++-------
libogmrip/ogmrip-fs.c | 4 ++--
libogmrip/ogmrip-fs.h | 4 ++--
libogmrip/ogmrip-lavc.c | 2 +-
libogmrip/ogmrip-lavc.h | 2 +-
libogmrip/ogmrip-plugin.c | 10 +++++-----
libogmrip/ogmrip-plugin.h | 8 ++++----
libogmrip/ogmrip-subp-codec.c | 2 +-
libogmrip/ogmrip-subp-codec.h | 2 +-
26 files changed, 75 insertions(+), 75 deletions(-)
--- NEW FILE ogmrip-0.13.6-g_const_return_deprecated.patch ---
Index: libogmrip/ogmrip-fs.c
===================================================================
--- libogmrip/ogmrip-fs.c (revision 2063)
+++ libogmrip/ogmrip-fs.c (working copy)
@@ -51,7 +51,7 @@
*
* Returns: The temporaty directory
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_fs_get_tmp_dir (void)
{
if (!ogmrip_tmp_dir)
@@ -618,7 +618,7 @@
*
* Returns: The extension, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_fs_get_extension (const gchar *filename)
{
gchar *dot;
Index: libogmrip/ogmrip-chapters.c
===================================================================
--- libogmrip/ogmrip-chapters.c (revision 2063)
+++ libogmrip/ogmrip-chapters.c (working copy)
@@ -205,7 +205,7 @@
*
* Returns: The label
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_chapters_get_label (OGMRipChapters *chapters, guint n)
{
g_return_val_if_fail (OGMRIP_IS_CHAPTERS (chapters), NULL);
Index: libogmrip/ogmrip-fs.h
===================================================================
--- libogmrip/ogmrip-fs.h (revision 2063)
+++ libogmrip/ogmrip-fs.h (working copy)
@@ -30,7 +30,7 @@
#define g_chdir chdir
#endif
-G_CONST_RETURN
+const
gchar * ogmrip_fs_get_tmp_dir (void);
void ogmrip_fs_set_tmp_dir (const gchar *dir);
@@ -71,7 +71,7 @@
gchar * ogmrip_fs_get_full_path (const gchar *filename);
-G_CONST_RETURN
+const
gchar * ogmrip_fs_get_extension (const gchar *filename);
gchar * ogmrip_fs_set_extension (const gchar *filename,
const gchar *extension);
Index: libogmrip/ogmrip-codec.c
===================================================================
--- libogmrip/ogmrip-codec.c (revision 2063)
+++ libogmrip/ogmrip-codec.c (working copy)
@@ -294,7 +294,7 @@
*
* Returns: the filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_codec_get_output (OGMRipCodec *codec)
{
g_return_val_if_fail (OGMRIP_IS_CODEC (codec), NULL);
Index: libogmrip/ogmrip-chapters.h
===================================================================
--- libogmrip/ogmrip-chapters.h (revision 2063)
+++ libogmrip/ogmrip-chapters.h (working copy)
@@ -48,7 +48,7 @@
GType ogmrip_chapters_get_type (void);
OGMJobSpawn * ogmrip_chapters_new (OGMDvdTitle *title,
const gchar *output);
-G_CONST_RETURN
+const
gchar * ogmrip_chapters_get_label (OGMRipChapters *chapters,
guint n);
void ogmrip_chapters_set_label (OGMRipChapters *chapters,
Index: libogmrip/ogmrip-codec.h
===================================================================
--- libogmrip/ogmrip-codec.h (revision 2063)
+++ libogmrip/ogmrip-codec.h (working copy)
@@ -53,7 +53,7 @@
};
GType ogmrip_codec_get_type (void);
-G_CONST_RETURN
+const
gchar * ogmrip_codec_get_output (OGMRipCodec *codec);
void ogmrip_codec_set_output (OGMRipCodec *codec,
const gchar *output);
Index: libogmrip/ogmrip-lavc.c
===================================================================
--- libogmrip/ogmrip-lavc.c (revision 2063)
+++ libogmrip/ogmrip-lavc.c (working copy)
@@ -135,7 +135,7 @@
return CLAMP (quantizer, 2, 31);
}
-static G_CONST_RETURN gchar *
+static const gchar *
ogmrip_lavc_get_codec (OGMRipLavc *lavc)
{
OGMRipLavcClass *klass;
Index: libogmrip/ogmrip-lavc.h
===================================================================
--- libogmrip/ogmrip-lavc.h (revision 2063)
+++ libogmrip/ogmrip-lavc.h (working copy)
@@ -69,7 +69,7 @@
OGMRipVideoCodecClass parent_class;
/* vtable */
- G_CONST_RETURN gchar * (* get_codec) (void);
+ const gchar * (* get_codec) (void);
};
/**
Index: libogmrip/ogmrip-encoding.c
===================================================================
--- libogmrip/ogmrip-encoding.c (revision 2063)
+++ libogmrip/ogmrip-encoding.c (working copy)
@@ -359,7 +359,7 @@
return data1->nr - data2->nr;
}
-static G_CONST_RETURN gchar *
+static const gchar *
ogmrip_encoding_get_device (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3550,7 +3550,7 @@
*
* Returns: The id, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_id (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3582,7 +3582,7 @@
*
* Returns: The profile' section, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_profile (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3622,7 +3622,7 @@
*
* Returns: The name of the encoding, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_label (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3669,7 +3669,7 @@
*
* Returns: The name of the chapter, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_chapter_label (OGMRipEncoding *encoding, guint nr)
{
OGMRipChapterData *data;
@@ -3829,7 +3829,7 @@
*
* Returns: The output filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_filename (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -3868,7 +3868,7 @@
*
* Returns: The log filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_logfile (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
@@ -4007,7 +4007,7 @@
*
* Returns: The FourCC, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_encoding_get_fourcc (OGMRipEncoding *encoding)
{
g_return_val_if_fail (OGMRIP_IS_ENCODING (encoding), NULL);
Index: libogmrip/ogmrip-encoding.h
===================================================================
--- libogmrip/ogmrip-encoding.h (revision 2063)
+++ libogmrip/ogmrip-encoding.h (working copy)
@@ -362,16 +362,16 @@
guint32 ogmrip_encoding_get_flags (OGMRipEncoding *encoding);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_id (OGMRipEncoding *encoding);
OGMDvdTitle * ogmrip_encoding_get_title (OGMRipEncoding *encoding);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_profile (OGMRipEncoding *encoding);
void ogmrip_encoding_set_profile (OGMRipEncoding *encoding,
const gchar *profile);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_label (OGMRipEncoding *encoding);
void ogmrip_encoding_set_label (OGMRipEncoding *encoding,
const gchar *label);
@@ -386,7 +386,7 @@
gint ogmrip_encoding_get_chapters_language (OGMRipEncoding *encoding);
void ogmrip_encoding_set_chapters_language (OGMRipEncoding *encoding,
guint language);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_chapter_label (OGMRipEncoding *encoding,
guint nr);
void ogmrip_encoding_set_chapter_label (OGMRipEncoding *encoding,
@@ -404,11 +404,11 @@
gboolean ogmrip_encoding_get_keep_tmp_files (OGMRipEncoding *encoding);
void ogmrip_encoding_set_keep_tmp_files (OGMRipEncoding *encoding,
gboolean keep_tmp_files);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_filename (OGMRipEncoding *encoding);
void ogmrip_encoding_set_filename (OGMRipEncoding *encoding,
const gchar *filename);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_logfile (OGMRipEncoding *encoding);
gint ogmrip_encoding_get_threads (OGMRipEncoding *encoding);
@@ -423,7 +423,7 @@
gboolean ogmrip_encoding_set_container_type (OGMRipEncoding *encoding,
GType type,
GError **error);
-G_CONST_RETURN
+const
gchar * ogmrip_encoding_get_fourcc (OGMRipEncoding *encoding);
void ogmrip_encoding_set_fourcc (OGMRipEncoding *encoding,
const gchar *fourcc);
Index: libogmrip/ogmrip-plugin.c
===================================================================
--- libogmrip/ogmrip-plugin.c (revision 2063)
+++ libogmrip/ogmrip-plugin.c (working copy)
@@ -367,7 +367,7 @@
return NULL;
}
-static G_CONST_RETURN gchar *
+static const gchar *
ogmrip_plugin_get_codec_name (GSList *list, GType type)
{
OGMRipPlugin *plugin;
@@ -542,7 +542,7 @@
*
* Returns: The name of the container, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_container_name (GType container)
{
OGMRipContainerPlugin *plugin;
@@ -740,7 +740,7 @@
*
* Returns: The name of the video codec, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_video_codec_name (GType codec)
{
g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_VIDEO_CODEC), NULL);
@@ -926,7 +926,7 @@
*
* Returns: The name of the audio codec, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_audio_codec_name (GType codec)
{
g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_AUDIO_CODEC), NULL);
@@ -1070,7 +1070,7 @@
*
* Returns: The name of the subtitle codec, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_plugin_get_subp_codec_name (GType codec)
{
g_return_val_if_fail (g_type_is_a (codec, OGMRIP_TYPE_SUBP_CODEC), NULL);
Index: libogmrip/ogmrip-plugin.h
===================================================================
--- libogmrip/ogmrip-plugin.h (revision 2063)
+++ libogmrip/ogmrip-plugin.h (working copy)
@@ -196,7 +196,7 @@
GType ogmrip_plugin_get_nth_container (guint n);
GType ogmrip_plugin_get_container_by_name (const gchar *name);
gint ogmrip_plugin_get_container_index (GType container);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_container_name (GType container);
gboolean ogmrip_plugin_get_container_bframes (GType container);
gint ogmrip_plugin_get_container_max_audio (GType container);
@@ -216,7 +216,7 @@
GType ogmrip_plugin_get_nth_video_codec (guint n);
GType ogmrip_plugin_get_video_codec_by_name (const gchar *name);
gint ogmrip_plugin_get_video_codec_index (GType codec);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_video_codec_name (GType codec);
gint ogmrip_plugin_get_video_codec_format (GType codec);
gint ogmrip_plugin_get_video_codec_passes (GType codec);
@@ -236,7 +236,7 @@
GType ogmrip_plugin_get_nth_audio_codec (guint n);
GType ogmrip_plugin_get_audio_codec_by_name (const gchar *name);
gint ogmrip_plugin_get_audio_codec_index (GType codec);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_audio_codec_name (GType codec);
gint ogmrip_plugin_get_audio_codec_format (GType codec);
GModule * ogmrip_plugin_get_audio_codec_module (GType codec);
@@ -254,7 +254,7 @@
GType ogmrip_plugin_get_nth_subp_codec (guint n);
GType ogmrip_plugin_get_subp_codec_by_name (const gchar *name);
gint ogmrip_plugin_get_subp_codec_index (GType codec);
-G_CONST_RETURN
+const
gchar * ogmrip_plugin_get_subp_codec_name (GType codec);
gint ogmrip_plugin_get_subp_codec_format (GType codec);
gboolean ogmrip_plugin_get_subp_codec_text (GType codec);
Index: libogmrip/ogmrip-edl.c
===================================================================
--- libogmrip/ogmrip-edl.c (revision 2063)
+++ libogmrip/ogmrip-edl.c (working copy)
@@ -217,7 +217,7 @@
*
* Returns: The filename
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_edl_get_filename (OGMRipEdl *edl)
{
g_return_val_if_fail (edl != NULL, NULL);
Index: libogmrip/ogmrip-edl.h
===================================================================
--- libogmrip/ogmrip-edl.h (revision 2063)
+++ libogmrip/ogmrip-edl.h (working copy)
@@ -56,7 +56,7 @@
void ogmrip_edl_ref (OGMRipEdl *edl);
void ogmrip_edl_unref (OGMRipEdl *edl);
-G_CONST_RETURN
+const
gchar * ogmrip_edl_get_filename (OGMRipEdl *edl);
void ogmrip_edl_add (OGMRipEdl *edl,
Index: libogmrip/ogmrip-subp-codec.c
===================================================================
--- libogmrip/ogmrip-subp-codec.c (revision 2063)
+++ libogmrip/ogmrip-subp-codec.c (working copy)
@@ -347,7 +347,7 @@
*
* Returns: the track name
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_subp_codec_get_label (OGMRipSubpCodec *subp)
{
g_return_val_if_fail (OGMRIP_IS_SUBP_CODEC (subp), NULL);
Index: libogmrip/ogmrip-subp-codec.h
===================================================================
--- libogmrip/ogmrip-subp-codec.h (revision 2063)
+++ libogmrip/ogmrip-subp-codec.h (working copy)
@@ -62,7 +62,7 @@
gint ogmrip_subp_codec_get_newline (OGMRipSubpCodec *subp);
void ogmrip_subp_codec_set_label (OGMRipSubpCodec *subp,
const gchar *label);
-G_CONST_RETURN
+const
gchar * ogmrip_subp_codec_get_label (OGMRipSubpCodec *subp);
G_END_DECLS
Index: libogmrip/ogmrip-audio-codec.c
===================================================================
--- libogmrip/ogmrip-audio-codec.c (revision 2063)
+++ libogmrip/ogmrip-audio-codec.c (working copy)
@@ -465,7 +465,7 @@
*
* Returns: the track name
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_audio_codec_get_label (OGMRipAudioCodec *audio)
{
g_return_val_if_fail (OGMRIP_IS_AUDIO_CODEC (audio), NULL);
Index: libogmrip/ogmrip-audio-codec.h
===================================================================
--- libogmrip/ogmrip-audio-codec.h (revision 2063)
+++ libogmrip/ogmrip-audio-codec.h (working copy)
@@ -71,7 +71,7 @@
gint ogmrip_audio_codec_get_sample_rate (OGMRipAudioCodec *audio);
void ogmrip_audio_codec_set_label (OGMRipAudioCodec *audio,
const gchar *label);
-G_CONST_RETURN
+const
gchar * ogmrip_audio_codec_get_label (OGMRipAudioCodec *audio);
gint ogmrip_audio_codec_get_samples_per_frame (OGMRipAudioCodec *audio);
Index: libogmrip/ogmrip-container.c
===================================================================
--- libogmrip/ogmrip-container.c (revision 2063)
+++ libogmrip/ogmrip-container.c (working copy)
@@ -325,7 +325,7 @@
*
* Returns: The filename, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_container_get_output (OGMRipContainer *container)
{
g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL);
@@ -358,7 +358,7 @@
*
* Returns: The label, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_container_get_label (OGMRipContainer *container)
{
g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL);
@@ -390,7 +390,7 @@
*
* Returns: The FourCC, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmrip_container_get_fourcc (OGMRipContainer *container)
{
g_return_val_if_fail (OGMRIP_IS_CONTAINER (container), NULL);
Index: libogmrip/ogmrip-container.h
===================================================================
--- libogmrip/ogmrip-container.h (revision 2063)
+++ libogmrip/ogmrip-container.h (working copy)
@@ -91,16 +91,16 @@
void ogmrip_container_set_options (OGMRipContainer *container,
const gchar *section);
-G_CONST_RETURN
+const
gchar * ogmrip_container_get_output (OGMRipContainer *container);
void ogmrip_container_set_output (OGMRipContainer *container,
const gchar *output);
-G_CONST_RETURN
+const
gchar * ogmrip_container_get_label (OGMRipContainer *container);
void ogmrip_container_set_label (OGMRipContainer *container,
const gchar *label);
-G_CONST_RETURN
+const
gchar * ogmrip_container_get_fourcc (OGMRipContainer *container);
void ogmrip_container_set_fourcc (OGMRipContainer *container,
const gchar *fourcc);
Index: libogmdvd/ogmdvd-labels.c
===================================================================
--- libogmdvd/ogmdvd-labels.c (revision 2063)
+++ libogmdvd/ogmdvd-labels.c (working copy)
@@ -248,7 +248,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_video_format_label (gint format)
{
static const gchar *video_format[] =
@@ -272,7 +272,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_display_aspect_label (gint aspect)
{
static gchar *display_aspect[] =
@@ -296,7 +296,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_format_label (gint format)
{
static gchar *audio_format[] =
@@ -324,7 +324,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_channels_label (gint channels)
{
static gchar *audio_channels[] =
@@ -352,7 +352,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_quantization_label (gint quantization)
{
static gchar *audio_quantization[] =
@@ -376,7 +376,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_audio_content_label (gint content)
{
static gchar *audio_content[] =
@@ -401,7 +401,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_subp_content_label (gint content)
{
static gchar *subp_content[] =
@@ -437,7 +437,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_language_label (gint code)
{
const gchar *lang;
@@ -460,7 +460,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_language_iso639_1 (gint code)
{
static gchar lang[3];
@@ -489,7 +489,7 @@
*
* Returns: A constant string, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_get_language_iso639_2 (gint code)
{
const gchar *lang;
Index: libogmdvd/ogmdvd-labels.h
===================================================================
--- libogmdvd/ogmdvd-labels.h (revision 2063)
+++ libogmdvd/ogmdvd-labels.h (working copy)
@@ -23,16 +23,16 @@
G_BEGIN_DECLS
-G_CONST_RETURN gchar * ogmdvd_get_video_format_label (gint format);
-G_CONST_RETURN gchar * ogmdvd_get_display_aspect_label (gint aspect);
-G_CONST_RETURN gchar * ogmdvd_get_audio_format_label (gint format);
-G_CONST_RETURN gchar * ogmdvd_get_audio_channels_label (gint channels);
-G_CONST_RETURN gchar * ogmdvd_get_audio_quantization_label (gint quantization);
-G_CONST_RETURN gchar * ogmdvd_get_audio_content_label (gint content);
-G_CONST_RETURN gchar * ogmdvd_get_subp_content_label (gint content);
-G_CONST_RETURN gchar * ogmdvd_get_language_label (gint code);
-G_CONST_RETURN gchar * ogmdvd_get_language_iso639_1 (gint code);
-G_CONST_RETURN gchar * ogmdvd_get_language_iso639_2 (gint code);
+const gchar * ogmdvd_get_video_format_label (gint format);
+const gchar * ogmdvd_get_display_aspect_label (gint aspect);
+const gchar * ogmdvd_get_audio_format_label (gint format);
+const gchar * ogmdvd_get_audio_channels_label (gint channels);
+const gchar * ogmdvd_get_audio_quantization_label (gint quantization);
+const gchar * ogmdvd_get_audio_content_label (gint content);
+const gchar * ogmdvd_get_subp_content_label (gint content);
+const gchar * ogmdvd_get_language_label (gint code);
+const gchar * ogmdvd_get_language_iso639_1 (gint code);
+const gchar * ogmdvd_get_language_iso639_2 (gint code);
G_END_DECLS
Index: libogmdvd/ogmdvd-title.c
===================================================================
--- libogmdvd/ogmdvd-title.c (revision 2063)
+++ libogmdvd/ogmdvd-title.c (working copy)
@@ -437,7 +437,7 @@
*
* Returns: a constant array of 16 integers, or NULL
*/
-G_CONST_RETURN guint *
+const guint *
ogmdvd_title_get_palette (OGMDvdTitle *title)
{
g_return_val_if_fail (title != NULL, NULL);
Index: libogmdvd/ogmdvd-disc.c
===================================================================
--- libogmdvd/ogmdvd-disc.c (revision 2063)
+++ libogmdvd/ogmdvd-disc.c (working copy)
@@ -134,7 +134,7 @@
return reader;
}
-static G_CONST_RETURN gchar *
+static const gchar *
dvd_reader_get_id (dvd_reader_t *reader)
{
static gchar str[33];
@@ -788,7 +788,7 @@
*
* Returns: The label of the DVD, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_disc_get_label (OGMDvdDisc *disc)
{
g_return_val_if_fail (disc != NULL, NULL);
@@ -804,7 +804,7 @@
*
* Returns: The identifier, or NULL
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_disc_get_id (OGMDvdDisc *disc)
{
g_return_val_if_fail (disc != NULL, NULL);
@@ -820,7 +820,7 @@
*
* Returns: The device of the DVD.
*/
-G_CONST_RETURN gchar *
+const gchar *
ogmdvd_disc_get_device (OGMDvdDisc *disc)
{
g_return_val_if_fail (disc != NULL, NULL);
Index: libogmdvd/ogmdvd-title.h
===================================================================
--- libogmdvd/ogmdvd-title.h (revision 2063)
+++ libogmdvd/ogmdvd-title.h (working copy)
@@ -54,7 +54,7 @@
void ogmdvd_title_get_aspect_ratio (OGMDvdTitle *title,
guint *numerator,
guint *denominator);
-G_CONST_RETURN
+const
guint * ogmdvd_title_get_palette (OGMDvdTitle *title);
gint ogmdvd_title_get_n_angles (OGMDvdTitle *title);
gint ogmdvd_title_get_n_chapters (OGMDvdTitle *title);
Index: libogmdvd/ogmdvd-disc.h
===================================================================
--- libogmdvd/ogmdvd-disc.h (revision 2063)
+++ libogmdvd/ogmdvd-disc.h (working copy)
@@ -67,11 +67,11 @@
void ogmdvd_disc_ref (OGMDvdDisc *disc);
void ogmdvd_disc_unref (OGMDvdDisc *disc);
-G_CONST_RETURN
+const
gchar * ogmdvd_disc_get_label (OGMDvdDisc *disc);
-G_CONST_RETURN
+const
gchar * ogmdvd_disc_get_id (OGMDvdDisc *disc);
-G_CONST_RETURN
+const
gchar * ogmdvd_disc_get_device (OGMDvdDisc *disc);
gint64 ogmdvd_disc_get_vmg_size (OGMDvdDisc *disc);
gint ogmdvd_disc_get_n_titles (OGMDvdDisc *disc);
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/ogmrip.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ogmrip.spec 22 Nov 2010 22:38:49 -0000 1.9
+++ ogmrip.spec 28 Jul 2011 09:27:56 -0000 1.10
@@ -1,6 +1,6 @@
Name: ogmrip
Version: 0.13.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: DVD ripping and encoding graphical user interface
Group: Applications/Multimedia
@@ -32,10 +32,17 @@
Requires(post): GConf2
Requires(postun): GConf2
-# These were patches were sent upstream in ogmrip-devel ML
+# These patches were sent upstream in ogmrip-devel ML
Patch0: ogmrip-0.13.6-gtk3_build_fix.patch
Patch1: ogmrip-0.13.6-libnotify07-compatibility.patch
+# Took from http://sourceforge.net/tracker/?func=detail&aid=3065523&group_id=75595&at...
+Patch2: ogmrip-0.13.6-audio-quality.patch
+
+# Upstream contacted:
+# http://sourceforge.net/mailarchive/forum.php?thread_name=CAP0i4rfD0MUX0hd...
+Patch3: ogmrip-0.13.6-g_const_return_deprecated.patch
+
%description
OGMRip is an application and a set of libraries for ripping and encoding DVDs
into AVI, OGM MP4 or Matroska files using a wide variety of codecs. It relies
@@ -63,6 +70,8 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p0
+%patch3 -p0
%build
%configure \
@@ -110,7 +119,6 @@
%postun -p /sbin/ldconfig
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
@@ -139,6 +147,10 @@
%changelog
+* Tue Jul 26 2011 Gianluca Sforna <giallu(a)gmail.com> - 0.13.6-2
+- Fix build with newer GLib
+- Fix preferences bug with upstream patch
+
* Sun Nov 21 2010 Gianluca Sforna <giallu(a)gmail.com> - 0.13.6-1
- new upstream release
- Fix build with GTK3 and libnotify 0.7
12 years, 9 months
- 1
- 0