← Back to branch summary

~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to src/plugins/growisofs/burn-growisofs.c

  • Committer: Bazaar Package Importer
  • Author(s): Loic Minier, Alan Baghumian, Loic Minier
  • Date: 2008-01-29 21:05:22 UTC
  • mfrom: (1.2.1 etch) (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20080129210522-8zijsud1f15uch2f
Tags: 0.7.1-1
http://bugs.debian.org/456901
[ Alan Baghumian ]
* New upstream stable releases (Closes: #456901).
* Refreshed 004_fix-windows-size patch
* Dropped 001_use-sys-inotify.h patch, merged upstream
* Updated debian/brasero.install to include plugins

[ Loic Minier ]
* Pass --disable-libburnia explicitely to avoid the support to be built in
  by surprize if the bdep is installed in a sufficiently high version in the
  future.
* Bump libgtk2.0-dev build-dep to >= 2.12.0 to match upstream README.
* Add a gstreamer0.10-plugins-base >= 0.10.0 dep to follow the upstream
  configure check.
* Drop gdl build-dep.
* Bump hal Recommends to >= 0.5.
* Bump libtotem-plparser-dev build-dep to >= 2.14.
* Build with inotify support.
  - Drop --disable-inotify configure flag.
  - Add an explicit libc6-dev (>= 2.5-1) build-dep.
* Bump up libtotem-plparser-dev build-dep to >= 2.20.0.
* Bump up Standards-Version to 3.7.3.
* Conflict with bonfire <= 0.4.4-1 -- not <<.
* Recommend gstreamer0.10-plugins-good and gnome-mount.
* Downgrade gstreamer0.10-fluendo-mp3 recommends to a suggest.
* New patch, 006-fix-libdvdcss, load libdvdcss lib with SONAME version as to
  not require the -dev package; Launchpad #134828; from Ubuntu.
* Drop patch 004_fix-windows-size, upstream fixed the initial window size
  differently.
* Build with beagle support; drop --disable-search and add a libbeagle-dev
  (>= 0.3.0) build-dep.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/growisofs/burn-growisofs.c
240
240
        if (input.subtype.fs_type & BRASERO_IMAGE_FS_JOLIET)
241
241
                g_ptr_array_add (argv, g_strdup ("-J"));
242
242
 
 
243
        if ((input.subtype.fs_type & BRASERO_IMAGE_FS_ISO)
 
244
        &&  (input.subtype.fs_type & BRASERO_IMAGE_ISO_FS_LEVEL_3)) {
 
245
                /* That's the safest option. A few OS don't support that though,
 
246
                 * like MacOSX and freebsd.*/
 
247
                g_ptr_array_add (argv, g_strdup ("-iso-level"));
 
248
                g_ptr_array_add (argv, g_strdup ("3"));
 
249
        }
 
250
 
 
251
        if (input.subtype.fs_type & BRASERO_IMAGE_FS_UDF)
 
252
                g_ptr_array_add (argv, g_strdup ("-udf"));
 
253
 
243
254
        if (input.subtype.fs_type & BRASERO_IMAGE_FS_VIDEO)
244
255
                g_ptr_array_add (argv, g_strdup ("-dvd-video"));
245
256
 
592
603
        BraseroGrowisofsPrivate *priv;
593
604
        gchar *standard_error;
594
605
        gboolean res;
 
606
        gchar *prog_name;
595
607
 
596
608
        priv = BRASERO_GROWISOFS_PRIVATE (obj);
597
609
 
598
610
        /* this code comes from ncb_mkisofs_supports_utf8 */
599
 
        res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", 
600
 
                                         NULL,
601
 
                                         &standard_error,
602
 
                                         NULL, 
603
 
                                         NULL);
604
 
        if (res && !g_strrstr (standard_error, "Unknown charset"))
 
611
        
 
612
        prog_name = g_find_program_in_path ("genisoimage");
 
613
        if (prog_name && g_file_test (prog_name, G_FILE_TEST_IS_EXECUTABLE)) {
 
614
                res = g_spawn_command_line_sync ("genisoimage -input-charset utf8", NULL, &standard_error, NULL, NULL);
 
615
        } else {
 
616
                res = g_spawn_command_line_sync ("mkisofs -input-charset utf8", NULL, &standard_error, NULL, NULL);
 
617
        }
 
618
 
 
619
        if (res && !g_strrstr (standard_error, "Unknown charset"))
605
620
                priv->use_utf8 = TRUE;
606
621
        else
607
622
                priv->use_utf8 = FALSE;
684
699
                                        BRASERO_MEDIUM_HAS_DATA);
685
700
        
686
701
        input = brasero_caps_data_new (BRASERO_IMAGE_FS_ISO|
 
702
                                       BRASERO_IMAGE_FS_UDF|
 
703
                                       BRASERO_IMAGE_ISO_FS_LEVEL_3|
687
704
                                       BRASERO_IMAGE_FS_JOLIET|
688
705
                                       BRASERO_IMAGE_FS_VIDEO);
689
706