Date: Thu, 1 Oct 2020 18:32:04 +0000 (UTC) From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550859 - in head/multimedia/gnome-mplayer: . files Message-ID: <202010011832.091IW4Im004669@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Thu Oct 1 18:32:04 2020 New Revision: 550859 URL: https://svnweb.freebsd.org/changeset/ports/550859 Log: Fix build with -fno-common Added: head/multimedia/gnome-mplayer/files/ head/multimedia/gnome-mplayer/files/patch-src_common.h (contents, props changed) head/multimedia/gnome-mplayer/files/patch-src_dbus-interface.h (contents, props changed) head/multimedia/gnome-mplayer/files/patch-src_gui.c (contents, props changed) head/multimedia/gnome-mplayer/files/patch-src_gui.h (contents, props changed) head/multimedia/gnome-mplayer/files/patch-src_playlist.h (contents, props changed) Modified: head/multimedia/gnome-mplayer/Makefile Modified: head/multimedia/gnome-mplayer/Makefile ============================================================================== --- head/multimedia/gnome-mplayer/Makefile Thu Oct 1 18:31:10 2020 (r550858) +++ head/multimedia/gnome-mplayer/Makefile Thu Oct 1 18:32:04 2020 (r550859) @@ -3,7 +3,7 @@ PORTNAME= gnome-mplayer PORTVERSION= 1.0.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia gnome MASTER_SITES= https://launchpad.net/ubuntu/+archive/primary/+files/ DISTNAME= gnome-mplayer_1.0.9.orig @@ -13,46 +13,53 @@ COMMENT= GNOME frontend for MPlayer LICENSE= GPLv2 -LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ +LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libdbus-glib-1.so:devel/dbus-glib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ libgmtk.so:multimedia/gmtk RUN_DEPENDS= mplayer:multimedia/mplayer USES= desktop-file-utils gettext gmake gnome pkgconfig xorg +USE_GNOME= cairo glib20 +GLIB_SCHEMAS= apps.gecko-mediaplayer.preferences.gschema.xml \ + apps.gnome-mplayer.preferences.enums.xml \ + apps.gnome-mplayer.preferences.gschema.xml +INSTALLS_ICONS= yes USE_XORG= x11 xscrnsaver -USE_GNOME= glib20 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nautilus \ --disable-nemo \ --disable-schemas-install \ --without-libgda \ --without-libmusicbrainz3 -INSTALLS_ICONS= yes -WRKSRC= ${WRKDIR}/gnome-mplayer-${PORTVERSION} - CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl -GLIB_SCHEMAS= apps.gecko-mediaplayer.preferences.gschema.xml \ - apps.gnome-mplayer.preferences.enums.xml \ - apps.gnome-mplayer.preferences.gschema.xml +WRKSRC= ${WRKDIR}/gnome-mplayer-${PORTVERSION} -OPTIONS_DEFINE= ALSA DOCS GIO GPOD GTK3 NOTIFY PULSEAUDIO +OPTIONS_DEFINE= ALSA DOCS GIO GPOD GTK3 NOTIFY PULSEAUDIO +GIO_DESC= Use GIO for file I/O +GPOD_DESC= Add support for libgpod + ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>0:audio/alsa-plugins ALSA_CONFIGURE_WITH= alsa -GIO_DESC= Use GIO for file I/O + GIO_CONFIGURE_WITH= gio -GPOD_DESC= Add support for libgpod GPOD_LIB_DEPENDS= libgpod.so:audio/libgpod GPOD_CONFIGURE_WITH= libgpod -GTK3_USE= gnome=gtk30 -GTK3_USE_OFF= gnome=gtk20 + +GTK3_USE= GNOME=gtk30 +GTK3_USE_OFF= GNOME=gtk20 GTK3_CONFIGURE_ENABLE= gtk3 + NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_RUN_DEPENDS= notification-daemon>0:deskutils/notification-daemon NOTIFY_CONFIGURE_WITH= libnotify -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio + +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_WITH= pulseaudio post-patch: Added: head/multimedia/gnome-mplayer/files/patch-src_common.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gnome-mplayer/files/patch-src_common.h Thu Oct 1 18:32:04 2020 (r550859) @@ -0,0 +1,350 @@ +--- src/common.h.orig 2014-04-24 03:38:08 UTC ++++ src/common.h +@@ -150,8 +150,8 @@ typedef enum { + QUIT + } PLAYSTATE; + +-PLAYSTATE guistate; +-PLAYSTATE lastguistate; ++extern PLAYSTATE guistate; ++extern PLAYSTATE lastguistate; + + typedef struct _IdleData { + gchar info[1024]; +@@ -190,7 +190,7 @@ typedef struct _IdleData { + #endif + } IdleData; + +-IdleData *idledata; ++extern IdleData *idledata; + + enum { + ITEM_COLUMN, +@@ -283,10 +283,10 @@ typedef struct _ButtonDef { + } ButtonDef; + + #define METER_BARS 40 +-gint buckets[METER_BARS]; +-gint max_buckets[METER_BARS]; +-gchar **accel_keys; +-gchar **accel_keys_description; ++extern gint buckets[METER_BARS]; ++extern gint max_buckets[METER_BARS]; ++extern gchar **accel_keys; ++extern gchar **accel_keys_description; + + //Define MIME for DnD + #define DRAG_NAME_0 "text/plain" +@@ -296,158 +296,158 @@ gchar **accel_keys_description; + #define DRAG_NAME_2 "STRING" + #define DRAG_INFO_2 2 + +-gint cache_size; +-gint plugin_audio_cache_size; +-gint plugin_video_cache_size; +-gboolean forcecache; +-gint osdlevel; +-gint pplevel; +-gint streaming; +-gboolean showcontrols; +-gboolean showsubtitles; +-gint fullscreen; +-gint init_fullscreen; +-gboolean videopresent; +-gboolean playlist; +-gint embed_window; +-gint window_x; +-gint window_y; +-gint control_id; +-gboolean softvol; +-gboolean remember_softvol; +-gdouble volume_softvol; +-gint volume_gain; +-gint pref_volume; +-gint verbose; +-gint autostart; ++extern gint cache_size; ++extern gint plugin_audio_cache_size; ++extern gint plugin_video_cache_size; ++extern gboolean forcecache; ++extern gint osdlevel; ++extern gint pplevel; ++extern gint streaming; ++extern gboolean showcontrols; ++extern gboolean showsubtitles; ++extern gint fullscreen; ++extern gint init_fullscreen; ++extern gboolean videopresent; ++extern gboolean playlist; ++extern gint embed_window; ++extern gint window_x; ++extern gint window_y; ++extern gint control_id; ++extern gboolean softvol; ++extern gboolean remember_softvol; ++extern gdouble volume_softvol; ++extern gint volume_gain; ++extern gint pref_volume; ++extern gint verbose; ++extern gint autostart; + //gint actual_x, actual_y; + //gint play_x, play_y; +-gint last_window_width, last_window_height; ++extern gint last_window_width, last_window_height; + //gchar vm[10]; +-gchar *vo; +-gchar *option_vo; +-gboolean use_hardware_codecs; +-gboolean use_crystalhd_codecs; +-AudioDevice audio_device; +-gchar *audio_device_name; +-gint audio_channels; +-gboolean use_hw_audio; +-gboolean disable_deinterlace; +-gboolean disable_framedrop; +-gboolean disable_context_menu; +-gboolean disable_fullscreen; +-gboolean disable_pause_on_click; +-gboolean enable_global_menu; +-gboolean enable_nautilus_plugin; +-gint loop; +-gint start_second; +-gint play_length; +-gint random_order; +-gboolean dontplaynext; +-gboolean autopause; +-gchar *path; +-gint js_state; +-gchar *rpconsole; +-gchar *rpcontrols; +-gboolean control_instance; +-gchar *playlistname; +-gboolean ok_to_play; +-gchar *subtitle; +-gchar *alang; +-gchar *slang; +-gchar *metadata_codepage; +-gboolean use_mplayer2; +-gboolean vertical_layout; +-gboolean playlist_visible; +-gboolean details_visible; +-gboolean restore_controls; +-gboolean update_control_flag; ++extern gchar *vo; ++extern gchar *option_vo; ++extern gboolean use_hardware_codecs; ++extern gboolean use_crystalhd_codecs; ++extern AudioDevice audio_device; ++extern gchar *audio_device_name; ++extern gint audio_channels; ++extern gboolean use_hw_audio; ++extern gboolean disable_deinterlace; ++extern gboolean disable_framedrop; ++extern gboolean disable_context_menu; ++extern gboolean disable_fullscreen; ++extern gboolean disable_pause_on_click; ++extern gboolean enable_global_menu; ++extern gboolean enable_nautilus_plugin; ++extern gint loop; ++extern gint start_second; ++extern gint play_length; ++extern gint random_order; ++extern gboolean dontplaynext; ++extern gboolean autopause; ++extern gchar *path; ++extern gint js_state; ++extern gchar *rpconsole; ++extern gchar *rpcontrols; ++extern gboolean control_instance; ++extern gchar *playlistname; ++extern gboolean ok_to_play; ++extern gchar *subtitle; ++extern gchar *alang; ++extern gchar *slang; ++extern gchar *metadata_codepage; ++extern gboolean use_mplayer2; ++extern gboolean vertical_layout; ++extern gboolean playlist_visible; ++extern gboolean details_visible; ++extern gboolean restore_controls; ++extern gboolean update_control_flag; + //gint restore_pane; +-gboolean disable_ass; +-gboolean disable_embeddedfonts; +-gboolean disable_animation; +-gint auto_hide_timeout; +-gboolean always_hide_after_timeout; +-gboolean mouse_over_controls; +-gchar *subtitlefont; +-gdouble subtitle_scale; +-gchar *subtitle_codepage; +-gchar *subtitle_color; +-gboolean subtitle_outline; +-gboolean subtitle_shadow; +-gint subtitle_margin; +-gint subtitle_fuzziness; +-gboolean quit_on_complete; +-gchar *mplayer_bin; +-gchar *mplayer_dvd_device; +-gchar *option_dvd_device; +-gchar *extraopts; +-gboolean resize_on_new_media; +-gboolean single_instance; +-gboolean replace_and_play; +-gboolean bring_to_front; +-gboolean show_notification; +-gboolean show_status_icon; +-gchar *gpod_mount_point; +-gboolean disable_cover_art_fetch; ++extern gboolean disable_ass; ++extern gboolean disable_embeddedfonts; ++extern gboolean disable_animation; ++extern gint auto_hide_timeout; ++extern gboolean always_hide_after_timeout; ++extern gboolean mouse_over_controls; ++extern gchar *subtitlefont; ++extern gdouble subtitle_scale; ++extern gchar *subtitle_codepage; ++extern gchar *subtitle_color; ++extern gboolean subtitle_outline; ++extern gboolean subtitle_shadow; ++extern gint subtitle_margin; ++extern gint subtitle_fuzziness; ++extern gboolean quit_on_complete; ++extern gchar *mplayer_bin; ++extern gchar *mplayer_dvd_device; ++extern gchar *option_dvd_device; ++extern gchar *extraopts; ++extern gboolean resize_on_new_media; ++extern gboolean single_instance; ++extern gboolean replace_and_play; ++extern gboolean bring_to_front; ++extern gboolean show_notification; ++extern gboolean show_status_icon; ++extern gchar *gpod_mount_point; ++extern gboolean disable_cover_art_fetch; + //gboolean updating_recent; +-gboolean large_buttons; +-GtkIconSize button_size; +-gboolean skip_fixed_allocation_on_show; +-gboolean skip_fixed_allocation_on_hide; +-gboolean mouse_wheel_changes_volume; +-ResumeMode resume_mode; ++extern gboolean large_buttons; ++extern GtkIconSize button_size; ++extern gboolean skip_fixed_allocation_on_show; ++extern gboolean skip_fixed_allocation_on_hide; ++extern gboolean mouse_wheel_changes_volume; ++extern ResumeMode resume_mode; + +-gboolean remember_loc; +-gboolean use_remember_loc; +-gboolean save_loc; +-gint loc_window_x; +-gint loc_window_y; +-gint loc_window_height; +-gint loc_window_width; +-gint loc_panel_position; +-gboolean keep_on_top; ++extern gboolean remember_loc; ++extern gboolean use_remember_loc; ++extern gboolean save_loc; ++extern gint loc_window_x; ++extern gint loc_window_y; ++extern gint loc_window_height; ++extern gint loc_window_width; ++extern gint loc_panel_position; ++extern gboolean keep_on_top; + +-gboolean cancel_folder_load; ++extern gboolean cancel_folder_load; + +-GThreadPool *retrieve_metadata_pool; +-GMutex *retrieve_mutex; +-GMutex *set_mutex; ++extern GThreadPool *retrieve_metadata_pool; ++extern GMutex *retrieve_mutex; ++extern GMutex *set_mutex; + +-gboolean use_mediakeys; +-gboolean use_defaultpl; ++extern gboolean use_mediakeys; ++extern gboolean use_defaultpl; + +-gboolean qt_disabled; +-gboolean real_disabled; +-gboolean wmp_disabled; +-gboolean dvx_disabled; +-gboolean midi_disabled; +-gboolean embedding_disabled; +-gboolean disable_embedded_scaling; ++extern gboolean qt_disabled; ++extern gboolean real_disabled; ++extern gboolean wmp_disabled; ++extern gboolean dvx_disabled; ++extern gboolean midi_disabled; ++extern gboolean embedding_disabled; ++extern gboolean disable_embedded_scaling; + +-GArray *data; +-GArray *max_data; +-gboolean reading_af_export; ++extern GArray *data; ++extern GArray *max_data; ++extern gboolean reading_af_export; + + //gboolean sub_source_file; + + // layout variables +-gint non_fs_width; +-gint non_fs_height; ++extern gint non_fs_width; ++extern gint non_fs_height; + + // playlist stuff +-GtkListStore *playliststore; +-GtkTreeIter iter; +-GtkTreeIter *next_iter; +-GtkTreeSelection *selection; +-GtkWidget *list; ++extern GtkListStore *playliststore; ++extern GtkTreeIter iter; ++extern GtkTreeIter *next_iter; ++extern GtkTreeSelection *selection; ++extern GtkWidget *list; + + // preference store +-GmPrefStore *gm_store; +-GmPrefStore *gmp_store; ++extern GmPrefStore *gm_store; ++extern GmPrefStore *gmp_store; + + // cover +-gchar *cover_art_uri; ++extern gchar *cover_art_uri; + + GtkWidget *create_window(gint windowid); + void show_window(gint windowid); +@@ -523,18 +523,18 @@ void set_media_player_attributes(GtkWidget * widget); + + void retrieve_metadata(gpointer data, gpointer user_data); + +-gchar *default_playlist; +-gboolean safe_to_save_default_playlist; ++extern gchar *default_playlist; ++extern gboolean safe_to_save_default_playlist; + + gboolean async_play_iter(void *data); + + #ifdef GTK2_12_ENABLED +-GtkRecentManager *recent_manager; ++extern GtkRecentManager *recent_manager; + void recent_manager_changed_callback(GtkRecentManager * recent_manager, gpointer data); + #endif + + #ifdef LIBGDA_ENABLED +-GdaConnection *db_connection; ++extern GdaConnection *db_connection; + #endif + + #endif /* _COMMON_H */ Added: head/multimedia/gnome-mplayer/files/patch-src_dbus-interface.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gnome-mplayer/files/patch-src_dbus-interface.h Thu Oct 1 18:32:04 2020 (r550859) @@ -0,0 +1,9 @@ +--- src/dbus-interface.h.orig 2014-04-24 03:38:08 UTC ++++ src/dbus-interface.h +@@ -37,5 +37,5 @@ + #include <X11/extensions/scrnsaver.h> + #endif + +-gboolean screensaver_disabled; ++extern gboolean screensaver_disabled; + gboolean dbus_hookup(gint windowid, gint controlid); Added: head/multimedia/gnome-mplayer/files/patch-src_gui.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gnome-mplayer/files/patch-src_gui.c Thu Oct 1 18:32:04 2020 (r550859) @@ -0,0 +1,240 @@ +--- src/gui.c.orig 2014-04-24 03:38:08 UTC ++++ src/gui.c +@@ -50,6 +50,237 @@ + #include "database.h" + #endif + ++GtkWidget *window; ++ ++GtkMenuItem *menuitem_edit_random; ++GtkMenuItem *menuitem_edit_loop; ++GtkMenuItem *menuitem_edit_play_single; ++GtkWidget *repeat; ++GtkWidget *shuffle; ++GtkMenuItem *menuitem_edit_select_audio_lang; ++GtkMenuItem *menuitem_edit_select_sub_lang; ++GtkWidget *tracks; ++GtkWidget *subtitles; ++ ++GtkMenuItem *menuitem_view_info; ++GtkMenuItem *menuitem_view_playlist; ++ ++GtkMenuItem *menuitem_prev; ++GtkMenuItem *menuitem_next; ++ ++GtkWidget *pane; ++GtkWidget *hbox; ++ ++GtkWidget *media; ++GtkWidget *cover_art; ++GtkWidget *audio_meter; ++ ++GtkWidget *details_table; ++ ++GtkWidget *play_event_box; ++ ++GtkWidget *prev_event_box; ++GtkWidget *next_event_box; ++GtkWidget *menu_event_box; ++GtkWidget *fs_event_box; ++ ++GmtkMediaTracker *tracker; ++GtkWidget *vol_slider; ++ ++GtkWidget *conf_volume_label; ++ ++#ifdef GTK2_12_ENABLED ++#else ++GtkTooltips *tooltip; ++#endif ++ ++// Playlist container ++GtkWidget *plvbox; ++GSList *lang_group; ++GSList *audio_group; ++ ++GtkAccelGroup *accel_group; ++ ++gint buckets[METER_BARS]; ++gint max_buckets[METER_BARS]; ++gchar **accel_keys; ++gchar **accel_keys_description; ++ ++gint cache_size; ++gint plugin_audio_cache_size; ++gint plugin_video_cache_size; ++gboolean forcecache; ++gint osdlevel; ++gint pplevel; ++gint streaming; ++gboolean showcontrols; ++gboolean showsubtitles; ++gint fullscreen; ++gint init_fullscreen; ++gboolean videopresent; ++gboolean playlist; ++gint embed_window; ++gint window_x; ++gint window_y; ++gint control_id; ++gboolean softvol; ++gboolean remember_softvol; ++gdouble volume_softvol; ++gint volume_gain; ++gint pref_volume; ++gint verbose; ++gint autostart; ++//gint actual_x, actual_y; ++//gint play_x, play_y; ++gint last_window_width, last_window_height; ++//gchar vm[10]; ++gchar *vo; ++gchar *option_vo; ++gboolean use_hardware_codecs; ++gboolean use_crystalhd_codecs; ++AudioDevice audio_device; ++gchar *audio_device_name; ++gint audio_channels; ++gboolean use_hw_audio; ++gboolean disable_deinterlace; ++gboolean disable_framedrop; ++gboolean disable_context_menu; ++gboolean disable_fullscreen; ++gboolean disable_pause_on_click; ++gboolean enable_global_menu; ++gboolean enable_nautilus_plugin; ++gint loop; ++gint start_second; ++gint play_length; ++gint random_order; ++gboolean dontplaynext; ++gboolean autopause; ++gchar *path; ++gint js_state; ++gchar *rpconsole; ++gchar *rpcontrols; ++gboolean control_instance; ++gchar *playlistname; ++gboolean ok_to_play; ++gchar *subtitle; ++gchar *alang; ++gchar *slang; ++gchar *metadata_codepage; ++gboolean use_mplayer2; ++gboolean vertical_layout; ++gboolean playlist_visible; ++gboolean details_visible; ++gboolean restore_controls; ++gboolean update_control_flag; ++//gint restore_pane; ++//gboolean updating_recent; ++gboolean disable_ass; ++gboolean disable_embeddedfonts; ++gboolean disable_animation; ++gint auto_hide_timeout; ++gboolean always_hide_after_timeout; ++gboolean mouse_over_controls; ++gchar *subtitlefont; ++gdouble subtitle_scale; ++gchar *subtitle_codepage; ++gchar *subtitle_color; ++gboolean subtitle_outline; ++gboolean subtitle_shadow; ++gint subtitle_margin; ++gint subtitle_fuzziness; ++gboolean quit_on_complete; ++gchar *mplayer_bin; ++gchar *mplayer_dvd_device; ++gchar *option_dvd_device; ++gchar *extraopts; ++gboolean resize_on_new_media; ++gboolean single_instance; ++gboolean replace_and_play; ++gboolean bring_to_front; ++gboolean show_notification; ++gboolean show_status_icon; ++gchar *gpod_mount_point; ++gboolean disable_cover_art_fetch; ++//gboolean updating_recent; ++gboolean large_buttons; ++GtkIconSize button_size; ++gboolean skip_fixed_allocation_on_show; ++gboolean skip_fixed_allocation_on_hide; ++gboolean mouse_wheel_changes_volume; ++ResumeMode resume_mode; ++ ++gboolean remember_loc; ++gboolean use_remember_loc; ++gboolean save_loc; ++gint loc_window_x; ++gint loc_window_y; ++gint loc_window_height; ++gint loc_window_width; ++gint loc_panel_position; ++gboolean keep_on_top; ++ ++gboolean cancel_folder_load; ++ ++GThreadPool *retrieve_metadata_pool; ++GMutex *retrieve_mutex; ++GMutex *set_mutex; ++ ++gboolean use_mediakeys; ++gboolean use_defaultpl; ++ ++gboolean qt_disabled; ++gboolean real_disabled; ++gboolean wmp_disabled; ++gboolean dvx_disabled; ++gboolean midi_disabled; ++gboolean embedding_disabled; ++gboolean disable_embedded_scaling; ++ ++GArray *data; ++GArray *max_data; ++gboolean reading_af_export; ++ ++//gboolean sub_source_file; ++ ++// layout variables ++gint non_fs_width; ++gint non_fs_height; ++ ++// playlist stuff ++GtkListStore *playliststore; ++GtkTreeIter iter; ++GtkTreeIter *next_iter; ++GtkTreeSelection *selection; ++GtkWidget *list; ++ ++// preference store ++GmPrefStore *gm_store; ++GmPrefStore *gmp_store; ++ ++// cover ++gchar *cover_art_uri; ++ ++gchar *default_playlist; ++gboolean safe_to_save_default_playlist; ++ ++#ifdef GTK2_12_ENABLED ++GtkRecentManager *recent_manager; ++#endif ++ ++#ifdef LIBGDA_ENABLED ++GdaConnection *db_connection; ++#endif ++ ++gboolean screensaver_disabled; ++ ++gint window_width, window_height; ++ ++GtkWidget *plclose; ++IdleData *idledata; ++GMutex *fs_controls_lock; ++PLAYSTATE guistate; ++PLAYSTATE lastguistate; ++ + static GdkWindow *window_container; + static GtkWidget *fs_window; + static GtkWidget *fs_controls; Added: head/multimedia/gnome-mplayer/files/patch-src_gui.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gnome-mplayer/files/patch-src_gui.h Thu Oct 1 18:32:04 2020 (r550859) @@ -0,0 +1,101 @@ +--- src/gui.h.orig 2014-04-24 03:38:08 UTC ++++ src/gui.h +@@ -44,56 +44,56 @@ + + #include "playlist.h" + +-GtkWidget *window; ++extern GtkWidget *window; + +-GtkMenuItem *menuitem_edit_random; +-GtkMenuItem *menuitem_edit_loop; +-GtkMenuItem *menuitem_edit_play_single; +-GtkWidget *repeat; +-GtkWidget *shuffle; +-GtkMenuItem *menuitem_edit_select_audio_lang; +-GtkMenuItem *menuitem_edit_select_sub_lang; +-GtkWidget *tracks; +-GtkWidget *subtitles; ++extern GtkMenuItem *menuitem_edit_random; ++extern GtkMenuItem *menuitem_edit_loop; ++extern GtkMenuItem *menuitem_edit_play_single; ++extern GtkWidget *repeat; ++extern GtkWidget *shuffle; ++extern GtkMenuItem *menuitem_edit_select_audio_lang; ++extern GtkMenuItem *menuitem_edit_select_sub_lang; ++extern GtkWidget *tracks; ++extern GtkWidget *subtitles; + +-GtkMenuItem *menuitem_view_info; +-GtkMenuItem *menuitem_view_playlist; ++extern GtkMenuItem *menuitem_view_info; ++extern GtkMenuItem *menuitem_view_playlist; + +-GtkMenuItem *menuitem_prev; +-GtkMenuItem *menuitem_next; ++extern GtkMenuItem *menuitem_prev; ++extern GtkMenuItem *menuitem_next; + +-GtkWidget *pane; +-GtkWidget *hbox; ++extern GtkWidget *pane; ++extern GtkWidget *hbox; + +-GtkWidget *media; +-GtkWidget *cover_art; +-GtkWidget *audio_meter; ++extern GtkWidget *media; ++extern GtkWidget *cover_art; ++extern GtkWidget *audio_meter; + +-GtkWidget *details_table; ++extern GtkWidget *details_table; + +-GtkWidget *play_event_box; ++extern GtkWidget *play_event_box; + +-GtkWidget *prev_event_box; +-GtkWidget *next_event_box; +-GtkWidget *menu_event_box; +-GtkWidget *fs_event_box; ++extern GtkWidget *prev_event_box; ++extern GtkWidget *next_event_box; ++extern GtkWidget *menu_event_box; ++extern GtkWidget *fs_event_box; + +-GmtkMediaTracker *tracker; +-GtkWidget *vol_slider; ++extern GmtkMediaTracker *tracker; ++extern GtkWidget *vol_slider; + +-GtkWidget *conf_volume_label; ++extern GtkWidget *conf_volume_label; + + #ifdef GTK2_12_ENABLED + #else +-GtkTooltips *tooltip; ++extern GtkTooltips *tooltip; + #endif + + // Playlist container +-GtkWidget *plvbox; +-GSList *lang_group; +-GSList *audio_group; ++extern GtkWidget *plvbox; ++extern GSList *lang_group; ++extern GSList *audio_group; + +-GtkAccelGroup *accel_group; ++extern GtkAccelGroup *accel_group; + + gboolean popup_handler(GtkWidget * widget, GdkEvent * event, void *data); + gboolean delete_callback(GtkWidget * widget, GdkEvent * event, void *data); +@@ -138,7 +138,7 @@ void assign_default_keys(); + void reset_keys_callback(GtkButton * button, gpointer data); + gint get_index_from_key_and_modifier(guint key, GdkModifierType modifier); + +-GMutex *fs_controls_lock; ++extern GMutex *fs_controls_lock; + void show_fs_controls(); + void hide_fs_controls(); + gboolean set_destroy(gpointer data); Added: head/multimedia/gnome-mplayer/files/patch-src_playlist.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/gnome-mplayer/files/patch-src_playlist.h Thu Oct 1 18:32:04 2020 (r550859) @@ -0,0 +1,13 @@ +--- src/playlist.h.orig 2014-04-24 03:38:08 UTC ++++ src/playlist.h +@@ -29,8 +29,8 @@ + #include <glib.h> + #include <glib/gstdio.h> + +-GtkWidget *plclose; +-gint window_width, window_height; ++extern GtkWidget *plclose; ++extern gint window_width, window_height; + + void update_gui(); + void menuitem_view_playlist_callback(GtkMenuItem * menuitem, void *data);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010011832.091IW4Im004669>